---

yaml
---
r: 3712
b: refs/heads/master
c: edf8245
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1b107d74ef5c27ec4c000f1fe4a9f55a7c67b97
+refs/heads/master: edf82452730162a64ae87a8bb0865e037309a3d7

trunk/src/comp/back/link.rs

@@ -429,7 +429,7 @@ fn get_symbol_hash(&@crate_ctxt ccx, &ty::t t) -> str {
     ret hash;
 }
 
-fn mangle(&vec[str] ss) -> str {
+fn mangle(&str[] ss) -> str {
     // Follow C++ namespace-mangling style
 
     auto n = "_ZN"; // Begin name-sequence.
@@ -440,14 +440,14 @@ fn mangle(&vec[str] ss) -> str {
     ret n;
 }
 
-fn exported_name(&vec[str] path, &str hash, &str vers) -> str {
+fn exported_name(&str[] path, &str hash, &str vers) -> str {
     // FIXME: versioning isn't working yet
 
-    ret mangle(path + [hash]); //  + "@" + vers;
+    ret mangle(path + ~[hash]); //  + "@" + vers;
 
 }
 
-fn mangle_exported_name(&@crate_ctxt ccx, &vec[str] path, &ty::t t) -> str {
+fn mangle_exported_name(&@crate_ctxt ccx, &str[] path, &ty::t t) -> str {
     auto hash = get_symbol_hash(ccx, t);
     ret exported_name(path, hash, ccx.link_meta.vers);
 }
@@ -456,15 +456,15 @@ fn mangle_internal_name_by_type_only(&@crate_ctxt ccx, &ty::t t, &str name) ->
    str {
     auto s = util::ppaux::ty_to_short_str(ccx.tcx, t);
     auto hash = get_symbol_hash(ccx, t);
-    ret mangle([name, s, hash]);
+    ret mangle(~[name, s, hash]);
 }
 
-fn mangle_internal_name_by_path_and_seq(&@crate_ctxt ccx, &vec[str] path,
+fn mangle_internal_name_by_path_and_seq(&@crate_ctxt ccx, &str[] path,
                                         &str flav) -> str {
-    ret mangle(path + [ccx.names.next(flav)]);
+    ret mangle(path + ~[ccx.names.next(flav)]);
 }
 
-fn mangle_internal_name_by_path(&@crate_ctxt ccx, &vec[str] path) -> str {
+fn mangle_internal_name_by_path(&@crate_ctxt ccx, &str[] path) -> str {
     ret mangle(path);
 }
 

trunk/src/comp/back/upcall.rs

@@ -65,8 +65,8 @@ type upcalls =
 fn declare_upcalls(type_names tn, ModuleRef llmod) -> @upcalls {
     fn decl(type_names tn, ModuleRef llmod, str name, vec[TypeRef] tys,
             TypeRef rv) -> ValueRef {
-        let vec[TypeRef] arg_tys = [T_taskptr(tn)];
-        for (TypeRef t in tys) { arg_tys += [t]; }
+        let TypeRef[] arg_tys = ~[T_taskptr(tn)];
+        for (TypeRef t in tys) { arg_tys += ~[t]; }
         auto fn_ty = T_fn(arg_tys, rv);
         ret trans::decl_cdecl_fn(llmod, "upcall_" + name, fn_ty);
     }