---

yaml
---
r: 60711
b: refs/heads/auto
c: f254d11
h: refs/heads/master
i:
  60709: d09eff6
  60707: 939b7d5
  60703: 254be97
v: v3

Author: bors

[refs]

@@ -14,6 +14,6 @@ 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: d89a6ceb1b36e7460afece5b3392c8f24f7ef6ce
+refs/heads/auto: f254d119eab514c91fbd6590fba821ec7a0bfd7f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/middle/trans/base.rs

@@ -1694,7 +1694,20 @@ pub fn create_llargs_for_fn_args(cx: fn_ctxt,
     vec::from_fn(args.len(), |i| {
         unsafe {
             let arg_n = first_real_arg + i;
-            llvm::LLVMGetParam(cx.llfn, arg_n as c_uint)
+            let arg = &args[i];
+            let llarg = llvm::LLVMGetParam(cx.llfn, arg_n as c_uint);
+
+            // Mark `&mut T` as no-alias, as the borrowck pass ensures it's true
+            match arg.ty.node {
+                ast::ty_rptr(_, mt) => {
+                    if mt.mutbl == ast::m_mutbl  {
+                        llvm::LLVMAddAttribute(llarg, lib::llvm::NoAliasAttribute as c_uint);
+                    }
+                }
+                _ => {}
+            }
+
+            llarg
         }
     })
 }

branches/auto/src/librustdoc/markdown_pass.rs

@@ -451,32 +451,16 @@ fn write_variants(
 fn write_variant(ctxt: &Ctxt, doc: doc::VariantDoc) {
     assert!(doc.sig.is_some());
     let sig = (&doc.sig).get();
-
-    // space out list items so they all end up within paragraph elements
-    ctxt.w.put_line(~"");
-
     match copy doc.desc {
         Some(desc) => {
-            ctxt.w.put_line(list_item_indent(fmt!("* `%s` - %s", sig, desc)));
+            ctxt.w.put_line(fmt!("* `%s` - %s", sig, desc));
         }
         None => {
             ctxt.w.put_line(fmt!("* `%s`", sig));
         }
     }
 }
 
-fn list_item_indent(item: &str) -> ~str {
-    let mut indented = ~[];
-    for str::each_line_any(item) |line| {
-        indented.push(line);
-    }
-
-    // separate markdown elements within `*` lists must be indented by four
-    // spaces, or they will escape the list context. indenting everything
-    // seems fine though.
-    str::connect_slices(indented, "\n    ")
-}
-
 fn write_trait(ctxt: &Ctxt, doc: doc::TraitDoc) {
     write_common(ctxt, doc.desc(), doc.sections());
     write_methods(ctxt, doc.methods);
@@ -823,9 +807,7 @@ mod test {
         assert!(str::contains(
             markdown,
             "\n\n#### Variants\n\
-             \n\
              \n* `b` - test\
-             \n\
              \n* `c` - test\n\n"));
     }
 
@@ -835,24 +817,7 @@ mod test {
         assert!(str::contains(
             markdown,
             "\n\n#### Variants\n\
-             \n\
              \n* `b`\
-             \n\
-             \n* `c`\n\n"));
-    }
-
-    #[test]
-    fn should_write_variant_list_with_indent() {
-        let markdown = render(
-            ~"enum a { #[doc = \"line 1\\n\\nline 2\"] b, c }");
-        assert!(str::contains(
-            markdown,
-            "\n\n#### Variants\n\
-             \n\
-             \n* `b` - line 1\
-             \n    \
-             \n    line 2\
-             \n\
              \n* `c`\n\n"));
     }
 
@@ -862,9 +827,7 @@ mod test {
         assert!(str::contains(
             markdown,
             "\n\n#### Variants\n\
-             \n\
              \n* `b(int)`\
-             \n\
              \n* `c(int)` - a\n\n"));
     }