---

yaml
---
r: 148825
b: refs/heads/try2
c: dce61c9
h: refs/heads/master
i:
  148823: ebc9cb6
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c19a7b68577f28547bdfb357798d05163ccb6824
+refs/heads/try2: dce61c980e0f5e18972caa22e0b78995f0501f51
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/zsh/_rust

@@ -5,80 +5,110 @@ local -a _rustc_opts_switches _rustc_opts_lint _rustc_opts_debug
 typeset -A opt_args
 
 _rustc_opts_switches=(
+    --android-cross-path'[The path to the Android NDK]'
+    --ar'[Program to use for managing archives instead of the default.]'
     --bin'[Compile an executable crate (default)]'
     -c'[Compile and assemble, but do not link]'
     --cfg'[Configure the compilation environment]'
+    --crate-id'[Output the crate id and exit]'
+    --crate-file-name'[Output the file(s) that would be written if compilation continued and exit]'
+    --crate-name'[Output the crate name and exit]'
+    --dep-info'[Output dependency info to <filename> after compiling]'
+    --dylib'[Compile a dynamic library crate]'
     --emit-llvm'[Produce an LLVM bitcode file]'
     {-h,--help}'[Display this message]'
     -L'[Add a directory to the library search path]'
     --lib'[Compile a library crate]'
     --linker'[Program to use for linking instead of the default.]'
     --link-args'[FLAGS is a space-separated list of flags passed to the linker]'
+    --llvm-args'[A list of arguments to pass to llvm, comma separated]'
     --ls'[List the symbols defined by a library crate]'
+    --no-analysis'[Parse and expand the output, but run no analysis or produce output]'
+    --no-rpath'[Disables setting the rpath in libs/exes]'
     --no-trans'[Run all passes except translation; no output]'
     -O'[Equivalent to --opt-level=2]'
     -o'[Write output to <filename>]'
     --opt-level'[Optimize with possible levels 0-3]'
     --out-dir'[Write output to compiler-chosen filename in <dir>]'
     --parse-only'[Parse only; do not compile, assemble, or link]'
+    --passes'[Comma or space separated list of pass names to use]'
     --pretty'[Pretty-print the input instead of compiling]'
+    --rlib'[Compile a rust library crate as an rlib file]'
     -S'[Compile only; do not assemble or link]'
     --save-temps'[Write intermediate files (.bc, .opt.bc, .o) in addition to normal output]'
+    --staticlib'[Compile a static library crate]'
     --sysroot'[Override the system root]'
     --test'[Build a test harness]'
     --target'[Target triple cpu-manufacturer-kernel\[-os\] to compile]'
     --target-cpu'[Select target processor (llc -mcpu=help for details)]'
     --target-feature'[Target specific attributes (llc -mattr=help for details)]'
-    --android-cross-path'[The path to the Android NDK]'
     {-v,--version}'[Print version info and exit]'
 )
 _rustc_opts_lint=(
-    'path-statement[path statements with no effect]'
-    'missing-trait-doc[detects missing documentation for traits]'
-    'missing-struct-doc[detects missing documentation for structs]'
+    'attribute-usage[detects bad use of attributes]'
     'ctypes[proper use of std::libc types in foreign modules]'
-    "unused-mut[detect mut variables which don't need to be mutable]"
-    'unused-imports[imports that are never used]'
-    'heap-memory[use of any (~ type or @ type) heap memory]'
-    'default-methods[allow default methods]'
-    'unused-variable[detect variables which are not used in any way]'
     'dead-assignment[detect assignments that will never be read]'
-    'unrecognized-lint[unrecognized lint attribute]'
-    'type-limits[comparisons made useless by limits of the types involved]'
-    'unused-unsafe[unnecessary use of an `unsafe` block]'
-    'while-true[suggest using loop { } instead of while(true) { }]'
-    'non-camel-case-types[types, variants and traits should have camel case names]'
+    'dead-code[detect piece of code that will never be used]'
+    'default-type-param-usage[prevents explicitly setting a type parameter with a default]'
+    'deprecated[detects use of #\[deprecated\] items]'
+    'experimental[detects use of #\[experimental\] items]'
+    'heap-memory[use of any (~ type or @ type) heap memory]'
     'managed-heap-memory[use of managed (@ type) heap memory]'
-    'unnecessary-allocation[detects unnecessary allocations that can be eliminated]'
+    'missing-doc[detects missing documentation for public members]'
+    'non-camel-case-types[types, variants and traits should have camel case names]'
+    'non-uppercase-pattern-statics[static constants in match patterns should be all caps]'
+    'non-uppercase-statics[static constants should have uppercase identifiers]'
     'owned-heap-memory[use of owned (~ type) heap memory]'
+    'path-statement[path statements with no effect]'
+    'type-limits[comparisons made useless by limits of the types involved]'
+    'type-overflow[literal out of range for its type]'
+    'unknown-crate-type[unknown crate type found in #\[crate_type\] directive]'
+    'unknown-features[unknown features found in crate-level #\[feature\] directives]'
+    'unnecessary-allocation[detects unnecessary allocations that can be eliminated]'
+    'unnecessary-parens[`if`, `match`, `while` and `return` do not need parentheses]'
+    'unnecessary-qualification[detects unnecessarily qualified names]'
+    'unnecessary-typecast[detects unnecessary type casts, that can be removed]'
+    'unreachable-code[detects unreachable code]'
+    'unrecognized-lint[unrecognized lint attribute]'
+    'unsafe-block[usage of an `unsafe` block]'
+    'unstable[detects use of #\[unstable\] items (incl. items with no stability attribute)]'
+    'unused-imports[imports that are never used]'
+    'unused-must-use[unused result of an type flagged as #\[must_use\]]'
+    "unused-mut[detect mut variables which don't need to be mutable]"
+    'unused-result[unused result of an expression in a statement]'
+    'unused-unsafe[unnecessary use of an `unsafe` block]'
+    'unused-variable[detect variables which are not used in any way]'
+    'warnings[mass-change the level for lints which produce warnings]'
+    'while-true[suggest using `loop { }` instead of `while true { }`]'
 )
 
 _rustc_opts_debug=(
-    'verbose:in general, enable more debug printouts'
-    'time-passes:measure time of each rustc pass'
-    'count-llvm-insns:count where LLVM instrs originate'
-    'time-llvm-passes:measure time of each LLVM pass'
-    'trans-stats:gather trans statistics'
-    'asm-comments:generate comments into the assembly (may change behavior)'
-    'no-verify:skip LLVM verification'
-    'trace:emit trace logs'
-    'coherence:perform coherence checking'
-    'borrowck-stats:gather borrowck statistics'
-    "borrowck-note-pure:note where purity is req'd"
-    "borrowck-note-loan:note where loans are req'd"
-    'no-landing-pads:omit landing pads for unwinding'
-    'debug-llvm:enable debug output from LLVM'
-    'count-type-sizes:count the sizes of aggregate types'
-    'meta-stats:gather metadata statistics'
-    'no-opt:do not optimize, even if -O is passed'
-    'print-link-args:Print the arguments passed to the linker'
-    'gc:Garbage collect shared data (experimental)'
-    'jit:Execute using JIT (experimental)'
-    'extra-debug-info:Extra debugging info (experimental)'
-    'debug-info:Produce debug info (experimental)'
-    'static:Use or produce static libraries or binaries (experimental)'
-    'no-debug-borrows:do not show where borrow checks fail'
-    'lint-llvm:Run the LLVM lint pass on the pre-optimization IR'
+    'asm-comments[generate comments into the assembly (may change behavior)]'
+    'borrowck-stats[gather borrowck statistics]'
+    'count-llvm-insns[count where LLVM instrs originate]'
+    'count-type-sizes[count the sizes of aggregate types]'
+    'debug-info[Produce debug info (experimental)]'
+    'debug-llvm[enable debug output from LLVM]'
+    'extra-debug-info[Extra debugging info (experimental)]'
+    'gc[Garbage collect shared data (experimental)]'
+    'gen-crate-map[Force generation of a toplevel crate map]'
+    'lto[Perform LLVM link-time optimizations]'
+    'meta-stats[gather metadata statistics]'
+    "no-integrated-as[Use external assembler rather than LLVM's integrated one]"
+    'no-landing-pads[omit landing pads for unwinding]'
+    'no-opt[do not optimize, even if -O is passed]'
+    "no-prepopulate-passes[Don't pre-populate the pass managers with a list of passes, only use the passes from --passes]"
+    "no-vectorize-loops[Don't run the loop vectorization optimization passes]"
+    "no-vectorize-slp[Don't run LLVM's SLP vectorization passes]"
+    'no-verify[skip LLVM verification]'
+    'prefer-dynamic[Prefer dynamic linking to static linking]'
+    'print-link-args[Print the arguments passed to the linker]'
+    'print-llvm-passes[Prints the llvm optimization passes being run]'
+    'soft-float[Generate software floating point library calls]'
+    'time-llvm-passes[measure time of each LLVM pass]'
+    'time-passes[measure time of each rustc pass]'
+    'trans-stats[gather trans statistics]'
+    'verbose[in general, enable more debug printouts]'
 )
 
 _rustc_opts_fun_lint(){

branches/try2/src/libstd/c_str.rs

@@ -68,6 +68,8 @@ use iter::{Iterator, range};
 use libc;
 use kinds::marker;
 use ops::Drop;
+use cmp::Eq;
+use clone::Clone;
 use option::{Option, Some, None};
 use ptr::RawPtr;
 use ptr;
@@ -76,6 +78,7 @@ use str;
 use vec::{CloneableVector, ImmutableVector, MutableVector};
 use vec;
 use unstable::intrinsics;
+use rt::global_heap::malloc_raw;
 
 /// Resolution options for the `null_byte` condition
 pub enum NullByteResolution {
@@ -99,6 +102,36 @@ pub struct CString {
     priv owns_buffer_: bool,
 }
 
+impl Clone for CString {
+    /// Clone this CString into a new, uniquely owned CString. For safety
+    /// reasons, this is always a deep clone, rather than the usual shallow
+    /// clone.
+    fn clone(&self) -> CString {
+        if self.buf.is_null() {
+            CString { buf: self.buf, owns_buffer_: self.owns_buffer_ }
+        } else {
+            let len = self.len() + 1;
+            let buf = unsafe { malloc_raw(len) } as *mut libc::c_char;
+            unsafe { ptr::copy_nonoverlapping_memory(buf, self.buf, len); }
+            CString { buf: buf as *libc::c_char, owns_buffer_: true }
+        }
+    }
+}
+
+impl Eq for CString {
+    fn eq(&self, other: &CString) -> bool {
+        if self.buf as uint == other.buf as uint {
+            true
+        } else if self.buf.is_null() || other.buf.is_null() {
+            false
+        } else {
+            unsafe {
+                libc::strcmp(self.buf, other.buf) == 0
+            }
+        }
+    }
+}
+
 impl CString {
     /// Create a C String from a pointer.
     pub unsafe fn new(buf: *libc::c_char, owns_buffer: bool) -> CString {
@@ -287,10 +320,7 @@ impl<'a> ToCStr for &'a [u8] {
 
     unsafe fn to_c_str_unchecked(&self) -> CString {
         let self_len = self.len();
-        let buf = libc::malloc(self_len as libc::size_t + 1) as *mut u8;
-        if buf.is_null() {
-            fail!("failed to allocate memory!");
-        }
+        let buf = malloc_raw(self_len + 1);
 
         ptr::copy_memory(buf, self.as_ptr(), self_len);
         *ptr::mut_offset(buf, self_len as int) = 0;
@@ -598,6 +628,44 @@ mod tests {
         let c_str = unsafe { CString::new(ptr::null(), false) };
         c_str.iter();
     }
+
+    #[test]
+    fn test_clone() {
+        let a = "hello".to_c_str();
+        let b = a.clone();
+        assert!(a == b);
+    }
+
+    #[test]
+    fn test_clone_noleak() {
+        fn foo(f: |c: &CString|) {
+            let s = ~"test";
+            let c = s.to_c_str();
+            // give the closure a non-owned CString
+            let mut c_ = c.with_ref(|c| unsafe { CString::new(c, false) } );
+            f(&c_);
+            // muck with the buffer for later printing
+            c_.with_mut_ref(|c| unsafe { *c = 'X' as libc::c_char } );
+        }
+
+        let mut c_: Option<CString> = None;
+        foo(|c| {
+            c_ = Some(c.clone());
+            c.clone();
+            // force a copy, reading the memory
+            c.as_bytes().to_owned();
+        });
+        let c_ = c_.unwrap();
+        // force a copy, reading the memory
+        c_.as_bytes().to_owned();
+    }
+
+    #[test]
+    fn test_clone_eq_null() {
+        let x = unsafe { CString::new(ptr::null(), false) };
+        let y = x.clone();
+        assert!(x == y);
+    }
 }
 
 #[cfg(test)]

branches/try2/src/test/run-pass/issue-8498.rs

@@ -8,36 +8,28 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
-
 pub fn main() {
-// This is ok
     match &[(~5,~7)] {
         ps => {
            let (ref y, _) = ps[0];
-           println!("1. y = {}", **y);
            assert!(**y == 5);
         }
     }
 
-// This is not entirely ok
     match Some(&[(~5,)]) {
         Some(ps) => {
            let (ref y,) = ps[0];
-           println!("2. y = {}", **y);
-           if **y != 5 { println!("sadness"); }
+           assert!(**y == 5);
         }
         None => ()
     }
 
-// This is not ok
     match Some(&[(~5,~7)]) {
         Some(ps) => {
            let (ref y, ref z) = ps[0];
-           println!("3. y = {} z = {}", **y, **z);
            assert!(**y == 5);
+           assert!(**z == 7);
         }
         None => ()
     }
 }
-