Check in generated files with new names and delete old ones.

clients/flickr/sha1_b525f9b.go

@@ -7,7 +7,7 @@ import (
 	"github.com/attic-labs/noms/types"
 )
 
-var __mainPackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef ref.Ref
+var __mainPackageInFile_sha1_b525f9b_CachedRef ref.Ref
 
 // This function builds up a Noms value that describes the type
 // package implemented by this file and registers it with the global
@@ -35,7 +35,7 @@ func init() {
 	}, []ref.Ref{
 		ref.Parse("sha1-fb09d21d144c518467325465327d46489cff7c47"),
 	})
-	__mainPackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef = types.RegisterPackage(&p)
+	__mainPackageInFile_sha1_b525f9b_CachedRef = types.RegisterPackage(&p)
 }
 
 // RemotePhoto
@@ -94,7 +94,7 @@ func (m RemotePhoto) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForRemotePhoto = types.MakeTypeRef(__mainPackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef, 0)
+	__typeRefForRemotePhoto = types.MakeTypeRef(__mainPackageInFile_sha1_b525f9b_CachedRef, 0)
 	types.RegisterFromValFunction(__typeRefForRemotePhoto, func(v types.Value) types.Value {
 		return RemotePhotoFromVal(v)
 	})
@@ -218,7 +218,7 @@ func (m Size) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForSize = types.MakeTypeRef(__mainPackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef, 1)
+	__typeRefForSize = types.MakeTypeRef(__mainPackageInFile_sha1_b525f9b_CachedRef, 1)
 	types.RegisterFromValFunction(__typeRefForSize, func(v types.Value) types.Value {
 		return SizeFromVal(v)
 	})
@@ -338,7 +338,7 @@ func (m MapOfSizeToString) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForMapOfSizeToString = types.MakeCompoundTypeRef(types.MapKind, types.MakeTypeRef(__mainPackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef, 1), types.MakePrimitiveTypeRef(types.StringKind))
+	__typeRefForMapOfSizeToString = types.MakeCompoundTypeRef(types.MapKind, types.MakeTypeRef(__mainPackageInFile_sha1_b525f9b_CachedRef, 1), types.MakePrimitiveTypeRef(types.StringKind))
 	types.RegisterFromValFunction(__typeRefForMapOfSizeToString, func(v types.Value) types.Value {
 		return MapOfSizeToStringFromVal(v)
 	})

clients/flickr/sha1_fb09d21.go

@@ -7,7 +7,7 @@ import (
 	"github.com/attic-labs/noms/types"
 )
 
-var __mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef ref.Ref
+var __mainPackageInFile_sha1_fb09d21_CachedRef ref.Ref
 
 // This function builds up a Noms value that describes the type
 // package implemented by this file and registers it with the global
@@ -29,7 +29,7 @@ func init() {
 			types.Choices{},
 		),
 	}, []ref.Ref{})
-	__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef = types.RegisterPackage(&p)
+	__mainPackageInFile_sha1_fb09d21_CachedRef = types.RegisterPackage(&p)
 }
 
 // Geoposition
@@ -72,7 +72,7 @@ func (m Geoposition) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 0)
+	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 0)
 	types.RegisterFromValFunction(__typeRefForGeoposition, func(v types.Value) types.Value {
 		return GeopositionFromVal(v)
 	})
@@ -164,7 +164,7 @@ func (m Georectangle) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 1)
+	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 1)
 	types.RegisterFromValFunction(__typeRefForGeorectangle, func(v types.Value) types.Value {
 		return GeorectangleFromVal(v)
 	})

clients/quad_tree/sha1_fb09d21.go

@@ -7,7 +7,7 @@ import (
 	"github.com/attic-labs/noms/types"
 )
 
-var __mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef ref.Ref
+var __mainPackageInFile_sha1_fb09d21_CachedRef ref.Ref
 
 // This function builds up a Noms value that describes the type
 // package implemented by this file and registers it with the global
@@ -29,7 +29,7 @@ func init() {
 			types.Choices{},
 		),
 	}, []ref.Ref{})
-	__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef = types.RegisterPackage(&p)
+	__mainPackageInFile_sha1_fb09d21_CachedRef = types.RegisterPackage(&p)
 }
 
 // Geoposition
@@ -72,7 +72,7 @@ func (m Geoposition) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 0)
+	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 0)
 	types.RegisterFromValFunction(__typeRefForGeoposition, func(v types.Value) types.Value {
 		return GeopositionFromVal(v)
 	})
@@ -164,7 +164,7 @@ func (m Georectangle) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 1)
+	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 1)
 	types.RegisterFromValFunction(__typeRefForGeorectangle, func(v types.Value) types.Value {
 		return GeorectangleFromVal(v)
 	})

clients/sfcrime_importer/sha1_fb09d21.go

@@ -7,7 +7,7 @@ import (
 	"github.com/attic-labs/noms/types"
 )
 
-var __mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef ref.Ref
+var __mainPackageInFile_sha1_fb09d21_CachedRef ref.Ref
 
 // This function builds up a Noms value that describes the type
 // package implemented by this file and registers it with the global
@@ -29,7 +29,7 @@ func init() {
 			types.Choices{},
 		),
 	}, []ref.Ref{})
-	__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef = types.RegisterPackage(&p)
+	__mainPackageInFile_sha1_fb09d21_CachedRef = types.RegisterPackage(&p)
 }
 
 // Geoposition
@@ -72,7 +72,7 @@ func (m Geoposition) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 0)
+	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 0)
 	types.RegisterFromValFunction(__typeRefForGeoposition, func(v types.Value) types.Value {
 		return GeopositionFromVal(v)
 	})
@@ -164,7 +164,7 @@ func (m Georectangle) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 1)
+	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 1)
 	types.RegisterFromValFunction(__typeRefForGeorectangle, func(v types.Value) types.Value {
 		return GeorectangleFromVal(v)
 	})

clients/sfcrime_search/sha1_fb09d21.go

@@ -7,7 +7,7 @@ import (
 	"github.com/attic-labs/noms/types"
 )
 
-var __mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef ref.Ref
+var __mainPackageInFile_sha1_fb09d21_CachedRef ref.Ref
 
 // This function builds up a Noms value that describes the type
 // package implemented by this file and registers it with the global
@@ -29,7 +29,7 @@ func init() {
 			types.Choices{},
 		),
 	}, []ref.Ref{})
-	__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef = types.RegisterPackage(&p)
+	__mainPackageInFile_sha1_fb09d21_CachedRef = types.RegisterPackage(&p)
 }
 
 // Geoposition
@@ -72,7 +72,7 @@ func (m Geoposition) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 0)
+	__typeRefForGeoposition = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 0)
 	types.RegisterFromValFunction(__typeRefForGeoposition, func(v types.Value) types.Value {
 		return GeopositionFromVal(v)
 	})
@@ -164,7 +164,7 @@ func (m Georectangle) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 1)
+	__typeRefForGeorectangle = types.MakeTypeRef(__mainPackageInFile_sha1_fb09d21_CachedRef, 1)
 	types.RegisterFromValFunction(__typeRefForGeorectangle, func(v types.Value) types.Value {
 		return GeorectangleFromVal(v)
 	})

clients/tagdex/types.go

@@ -469,4 +469,3 @@ func (s Geoposition) Longitude() types.Float32 {
 func (s Geoposition) SetLongitude(p types.Float32) Geoposition {
 	return GeopositionFromVal(s.m.Set(types.NewString("longitude"), p))
 }
-

nomdl/codegen/test/gen/sha1_bbf9c3d.go

@@ -7,7 +7,7 @@ import (
 	"github.com/attic-labs/noms/types"
 )
 
-var __genPackageInFile_sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288_CachedRef ref.Ref
+var __genPackageInFile_sha1_bbf9c3d_CachedRef ref.Ref
 
 // This function builds up a Noms value that describes the type
 // package implemented by this file and registers it with the global
@@ -23,7 +23,7 @@ func init() {
 		),
 		types.MakeEnumTypeRef("E", "e1", "e2", "e3"),
 	}, []ref.Ref{})
-	__genPackageInFile_sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288_CachedRef = types.RegisterPackage(&p)
+	__genPackageInFile_sha1_bbf9c3d_CachedRef = types.RegisterPackage(&p)
 }
 
 // S
@@ -66,7 +66,7 @@ func (m S) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForS = types.MakeTypeRef(__genPackageInFile_sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288_CachedRef, 0)
+	__typeRefForS = types.MakeTypeRef(__genPackageInFile_sha1_bbf9c3d_CachedRef, 0)
 	types.RegisterFromValFunction(__typeRefForS, func(v types.Value) types.Value {
 		return SFromVal(v)
 	})
@@ -139,7 +139,7 @@ func (e E) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForE = types.MakeTypeRef(__genPackageInFile_sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288_CachedRef, 1)
+	__typeRefForE = types.MakeTypeRef(__genPackageInFile_sha1_bbf9c3d_CachedRef, 1)
 	types.RegisterFromValFunction(__typeRefForE, func(v types.Value) types.Value {
 		return E(uint32(v.(types.UInt32)))
 	})

nomdl/codegen/test/gen/sha1_d31b592.go

@@ -7,7 +7,7 @@ import (
 	"github.com/attic-labs/noms/types"
 )
 
-var __genPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef ref.Ref
+var __genPackageInFile_sha1_d31b592_CachedRef ref.Ref
 
 // This function builds up a Noms value that describes the type
 // package implemented by this file and registers it with the global
@@ -30,7 +30,7 @@ func init() {
 	}, []ref.Ref{
 		ref.Parse("sha1-bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288"),
 	})
-	__genPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef = types.RegisterPackage(&p)
+	__genPackageInFile_sha1_d31b592_CachedRef = types.RegisterPackage(&p)
 }
 
 // D
@@ -73,7 +73,7 @@ func (m D) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForD = types.MakeTypeRef(__genPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef, 0)
+	__typeRefForD = types.MakeTypeRef(__genPackageInFile_sha1_d31b592_CachedRef, 0)
 	types.RegisterFromValFunction(__typeRefForD, func(v types.Value) types.Value {
 		return DFromVal(v)
 	})
@@ -161,7 +161,7 @@ func (m DUser) TypeRef() types.TypeRef {
 }
 
 func init() {
-	__typeRefForDUser = types.MakeTypeRef(__genPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef, 1)
+	__typeRefForDUser = types.MakeTypeRef(__genPackageInFile_sha1_d31b592_CachedRef, 1)
 	types.RegisterFromValFunction(__typeRefForDUser, func(v types.Value) types.Value {
 		return DUserFromVal(v)
 	})

types/list_iterator.go

@@ -37,4 +37,3 @@ func (it *listLeafIterator) next() (f Future, done bool) {
 	it.i++
 	return
 }
-