---

yaml
---
r: 73451
b: refs/heads/dist-snap
c: d89a6ce
h: refs/heads/master
i:
  73449: bf430e6
  73447: b621ed7
v: v3

Author: ben0x539

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: 2c2346e3d4f999b95a56444d978c3ea792828263
+refs/heads/dist-snap: d89a6ceb1b36e7460afece5b3392c8f24f7ef6ce
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -1694,20 +1694,7 @@ pub fn create_llargs_for_fn_args(cx: fn_ctxt,
     vec::from_fn(args.len(), |i| {
         unsafe {
             let arg_n = first_real_arg + i;
-            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
+            llvm::LLVMGetParam(cx.llfn, arg_n as c_uint)
         }
     })
 }

branches/dist-snap/src/librustdoc/markdown_pass.rs

@@ -451,16 +451,32 @@ 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(fmt!("* `%s` - %s", sig, desc));
+            ctxt.w.put_line(list_item_indent(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);
@@ -807,7 +823,9 @@ mod test {
         assert!(str::contains(
             markdown,
             "\n\n#### Variants\n\
+             \n\
              \n* `b` - test\
+             \n\
              \n* `c` - test\n\n"));
     }
 
@@ -817,7 +835,24 @@ 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"));
     }
 
@@ -827,7 +862,9 @@ mod test {
         assert!(str::contains(
             markdown,
             "\n\n#### Variants\n\
+             \n\
              \n* `b(int)`\
+             \n\
              \n* `c(int)` - a\n\n"));
     }
 

branches/dist-snap/src/libstd/os.rs

@@ -675,6 +675,11 @@ pub fn mkdir_recursive(p: &Path, mode: c_int) -> bool {
 /// Lists the contents of a directory
 #[allow(non_implicitly_copyable_typarams)]
 pub fn list_dir(p: &Path) -> ~[~str] {
+    if p.components.is_empty() && !p.is_absolute() {
+        // Not sure what the right behavior is here, but this
+        // prevents a bounds check failure later
+        return ~[];
+    }
     unsafe {
         #[cfg(target_os = "linux")]
         #[cfg(target_os = "android")]
@@ -1596,6 +1601,26 @@ mod tests {
         }
     }
 
+    #[test]
+    fn list_dir_empty_path() {
+        let dirs = os::list_dir(&Path(""));
+        assert!(dirs.is_empty());
+    }
+
+    #[test]
+    #[cfg(not(windows))]
+    fn list_dir_root() {
+        let dirs = os::list_dir(&Path("/"));
+        assert!(dirs.len() > 1);
+    }
+    #[test]
+    #[cfg(windows)]
+    fn list_dir_root() {
+        let dirs = os::list_dir(&Path("C:\\"));
+        assert!(dirs.len() > 1);
+    }
+
+
     #[test]
     fn path_is_dir() {
         assert!((os::path_is_dir(&Path("."))));