---

yaml
---
r: 132479
b: refs/heads/dist-snap
c: c586bf2
h: refs/heads/master
i:
  132477: 9292e05
  132475: 09ab5d5
  132471: 9755de5
  132463: 128fbc2
  132447: 7f084fa
  132415: bddfe6a
  132351: 3d2453d
v: v3

Author: cakebaker

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 795f6ae829ab1bfd72394a5da9096e2717ec0f62
+refs/heads/dist-snap: c586bf21aa56ec6ec0619137155c4cc83334808f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/doc/guide.md

@@ -2565,9 +2565,9 @@ It gives an error:
 
 ```{notrust,ignore}
    Compiling modules v0.1.0 (file:/home/you/projects/modules)
-src/modules.rs:2:5: 2:23 error: function `print_hello` is private
-src/modules.rs:2     hello::print_hello();
-                     ^~~~~~~~~~~~~~~~~~
+src/main.rs:2:5: 2:23 error: function `print_hello` is private
+src/main.rs:2     hello::print_hello();
+                  ^~~~~~~~~~~~~~~~~~
 ```
 
 To make it public, we use the `pub` keyword:

branches/dist-snap/src/librustc/middle/trans/common.rs

@@ -574,7 +574,7 @@ pub fn C_cstr(cx: &CrateContext, s: InternedString, null_terminated: bool) -> Va
                                                 !null_terminated as Bool);
 
         let gsym = token::gensym("str");
-        let g = format!("str{}", gsym.uint()).with_c_str(|buf| {
+        let g = format!("str{}", gsym).with_c_str(|buf| {
             llvm::LLVMAddGlobal(cx.llmod, val_ty(sc).to_ref(), buf)
         });
         llvm::LLVMSetInitializer(g, sc);
@@ -603,7 +603,7 @@ pub fn C_binary_slice(cx: &CrateContext, data: &[u8]) -> ValueRef {
         let lldata = C_bytes(cx, data);
 
         let gsym = token::gensym("binary");
-        let g = format!("binary{}", gsym.uint()).with_c_str(|buf| {
+        let g = format!("binary{}", gsym).with_c_str(|buf| {
             llvm::LLVMAddGlobal(cx.llmod, val_ty(lldata).to_ref(), buf)
         });
         llvm::LLVMSetInitializer(g, lldata);

branches/dist-snap/src/librustc/middle/trans/meth.rs

@@ -528,7 +528,7 @@ pub fn make_vtable<I: Iterator<ValueRef>>(ccx: &CrateContext,
     unsafe {
         let tbl = C_struct(ccx, components.as_slice(), false);
         let sym = token::gensym("vtable");
-        let vt_gvar = format!("vtable{}", sym.uint()).with_c_str(|buf| {
+        let vt_gvar = format!("vtable{}", sym).with_c_str(|buf| {
             llvm::LLVMAddGlobal(ccx.llmod, val_ty(tbl).to_ref(), buf)
         });
         llvm::LLVMSetInitializer(vt_gvar, tbl);