---

alexcrichton · alexcrichton · commit dc06086ff137 · 2014-03-13T16:24:46.000-07:00
yaml --- r: 149962 b: refs/heads/try2 c: a07149b h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 62989008956e284e6d0c61032ea8b67fbe735338
+refs/heads/try2: a07149b138fc1ff19d8a8510cf703ecb811961fd
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustc/middle/trans/common.rs b/branches/try2/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 {`