---

brson · brson · commit a0bc997cd747 · 2012-04-07T17:39:55.000-07:00
yaml --- r: 15399 b: refs/heads/try c: d9070b4 h: refs/heads/master i: 15397: 0f8854b 15395: 4ad45f5 15391: f45c63f v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 19b7a7d803b61456f9e14cad8d90fe26dea4b934
+refs/heads/try: d9070b4751a5f152ccdab32fd84707179109c3ec
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rustc/back/link.rs b/branches/try/src/rustc/back/link.rs
@@ -485,10 +485,8 @@ fn mangle(ss: path) -> str {
     n
 }
 
-fn exported_name(path: path, hash: str, _vers: str) -> str {
-    // FIXME: versioning isn't working yet
-    ret mangle(path + [path_name(hash)]); //  + "@" + vers;
-
+fn exported_name(path: path, hash: str, vers: str) -> str {
+    ret mangle(path + [path_name(hash)] + [path_name(vers)]);
 }
 
 fn mangle_exported_name(ccx: @crate_ctxt, path: path, t: ty::t) -> str {

Original file line number	Diff line number	Diff line change
`@@ -485,10 +485,8 @@ fn mangle(ss: path) -> str {`
`485`	`485`	`n`
`486`	`486`	`}`
`487`	`487`
`488`		`-fn exported_name(path: path, hash: str, _vers: str) -> str {`
`489`		`- // FIXME: versioning isn't working yet`
`490`		`- ret mangle(path + [path_name(hash)]); // + "@" + vers;`
`491`		`-`
	`488`	`+fn exported_name(path: path, hash: str, vers: str) -> str {`
	`489`	`+ ret mangle(path + [path_name(hash)] + [path_name(vers)]);`
`492`	`490`	`}`
`493`	`491`
`494`	`492`	`fn mangle_exported_name(ccx: @crate_ctxt, path: path, t: ty::t) -> str {`