---

alexcrichton · alexcrichton · commit 67a83556bf3a · 2014-03-13T16:24:46.000-07:00
yaml --- r: 105962 b: refs/heads/auto c: a07149b h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 62989008956e284e6d0c61032ea8b67fbe735338
+refs/heads/auto: a07149b138fc1ff19d8a8510cf703ecb811961fd
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc/middle/trans/common.rs b/branches/auto/src/librustc/middle/trans/common.rs
@@ -103,8 +103,13 @@ pub fn return_type_is_void(ccx: &CrateContext, ty: ty::t) -> bool {
     ty::type_is_nil(ty) || ty::type_is_bot(ty) || ty::type_is_empty(ccx.tcx, ty)
 }
 
+/// Generates a unique symbol based off the name given. This is used to create
+/// unique symbols for things like closures.
 pub fn gensym_name(name: &str) -> PathElem {
-    PathName(token::gensym(name))
+    let num = token::gensym(name);
+    // use one colon which will get translated to a period by the mangler, and
+    // we're guaranteed that `num` is globally unique for this crate.
+    PathName(token::gensym(format!("{}:{}", name, num)))
 }
 
 pub struct tydesc_info {

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,13 @@ pub fn return_type_is_void(ccx: &CrateContext, ty: ty::t) -> bool {`
`103`	`103`	`ty::type_is_nil(ty) \|\| ty::type_is_bot(ty) \|\| ty::type_is_empty(ccx.tcx, ty)`
`104`	`104`	`}`
`105`	`105`
	`106`	`+/// Generates a unique symbol based off the name given. This is used to create`
	`107`	`+/// unique symbols for things like closures.`
`106`	`108`	`pub fn gensym_name(name: &str) -> PathElem {`
`107`		`- PathName(token::gensym(name))`
	`109`	`+ let num = token::gensym(name);`
	`110`	`+ // use one colon which will get translated to a period by the mangler, and`
	`111`	+ // we're guaranteed that `num` is globally unique for this crate.
	`112`	`+ PathName(token::gensym(format!("{}:{}", name, num)))`
`108`	`113`	`}`
`109`	`114`
`110`	`115`	`pub struct tydesc_info {`