---

yaml
---
r: 137215
b: refs/heads/release-prep
c: 80401da
h: refs/heads/master
i:
  137213: d5d9513
  137211: 956d5fd
  137207: 3b097f0
  137199: a1a0053
  137183: 1385d39
  137151: 2b183f3
  137087: 5bb8817
  136959: 27850a0
  136703: b8daa17
  136191: bba4f63
  135167: cec7097
v: v3

Author: SimonSapin

[refs]

@@ -29,4 +29,4 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/heads/libuv-update-temp-branch: 6ed22c618766f1f2a2e108eef8ce3f51be0f70b7
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
-refs/heads/release-prep: f56c1c91f39b25aaa6453359c0a1da9269d5238f
+refs/heads/release-prep: 80401da12e47c6b3cce0e9921980ec49b1b03a10

branches/release-prep/src/libcollections/string.rs

@@ -613,7 +613,8 @@ impl String {
     ///
     /// # Failure
     ///
-    /// Fails if `len` > current length.
+    /// Fails if `new_len` > current length,
+    /// or if `new_len` is not a character boundary.
     ///
     /// # Example
     ///
@@ -624,9 +625,9 @@ impl String {
     /// ```
     #[inline]
     #[unstable = "the failure conventions for strings are under development"]
-    pub fn truncate(&mut self, len: uint) {
-        assert!(self.as_slice().is_char_boundary(len));
-        self.vec.truncate(len)
+    pub fn truncate(&mut self, new_len: uint) {
+        assert!(self.as_slice().is_char_boundary(new_len));
+        self.vec.truncate(new_len)
     }
 
     /// Appends a byte to this string buffer.

branches/release-prep/src/libnative/io/c_unix.rs

@@ -232,9 +232,11 @@ mod signal {
     pub static SA_SIGINFO: libc::c_int = 0x0040;
     pub static SIGCHLD: libc::c_int = 20;
 
-    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    #[cfg(target_os = "macos")]
+    #[cfg(target_os = "ios")]
     pub type sigset_t = u32;
-    #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
+    #[cfg(target_os = "freebsd")]
+    #[cfg(target_os = "dragonfly")]
     #[repr(C)]
     pub struct sigset_t {
         bits: [u32, ..4],
@@ -252,7 +254,8 @@ mod signal {
         pub status: libc::c_int,
     }
 
-    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    #[cfg(target_os = "macos")]
+    #[cfg(target_os = "ios")]
     #[repr(C)]
     pub struct sigaction {
         pub sa_handler: extern fn(libc::c_int),
@@ -261,7 +264,8 @@ mod signal {
         pub sa_flags: libc::c_int,
     }
 
-    #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
+    #[cfg(target_os = "freebsd")]
+    #[cfg(target_os = "dragonfly")]
     #[repr(C)]
     pub struct sigaction {
         pub sa_handler: extern fn(libc::c_int),

branches/release-prep/src/librustc/middle/trans/glue.rs

@@ -429,7 +429,7 @@ fn make_drop_glue<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, v0: ValueRef, t: ty::t)
                     tvec::make_drop_glue_unboxed(bcx, v0, ty, true)
                 }
                 ty::ty_str => {
-                    let unit_ty = ty::sequence_element_type(bcx.tcx(), content_ty);
+                    let unit_ty = ty::sequence_element_type(bcx.tcx(), t);
                     tvec::make_drop_glue_unboxed(bcx, v0, unit_ty, true)
                 }
                 ty::ty_trait(..) => {

branches/release-prep/src/librustc/middle/typeck/check/_match.rs

@@ -670,30 +670,30 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
                   (ty, default_region_var, ast::MutImmutable, None)
               }
               _ => {
-                  check_err("an array  pattern".to_string());
+                  check_err("a vector pattern".to_string());
                   return;
               }
           },
           ty::ty_rptr(r, mt) => match ty::get(mt.ty).sty {
               ty::ty_vec(ty, None) => (ty, r, mt.mutbl, None),
               _ => {
-                  check_err("an array pattern".to_string());
+                  check_err("a vector pattern".to_string());
                   return;
               }
           },
           _ => {
-              check_err("an array pattern".to_string());
+              check_err("a vector pattern".to_string());
               return;
           }
         };
 
         let min_len = before.len() + after.len();
         fixed.and_then(|count| match *slice {
             Some(_) if count < min_len =>
-                Some(format!("a fixed array pattern of size at least {}", min_len)),
+                Some(format!("a fixed vector pattern of size at least {}", min_len)),
 
             None if count != min_len =>
-                Some(format!("a fixed array pattern of size {}", min_len)),
+                Some(format!("a fixed vector pattern of size {}", min_len)),
 
             _ => None
         }).map(check_err);

branches/release-prep/src/librustc/middle/typeck/check/mod.rs

@@ -5004,14 +5004,9 @@ pub fn check_enum_variants(ccx: &CrateCtxt,
             };
 
             // Check for duplicate discriminant values
-            match disr_vals.iter().position(|&x| x == current_disr_val) {
-                Some(i) => {
-                    span_err!(ccx.tcx.sess, v.span, E0081,
-                        "discriminant value `{}` already exists", disr_vals[i]);
-                    span_note!(ccx.tcx.sess, ccx.tcx().map.span(variants[i].id.node),
-                        "conflicting discriminant here")
-                }
-                None => {}
+            if disr_vals.contains(&current_disr_val) {
+                span_err!(ccx.tcx.sess, v.span, E0081,
+                    "discriminant value already exists");
             }
             // Check for unrepresentable discriminant values
             match hint {

branches/release-prep/src/libsyntax/test.rs

@@ -274,43 +274,30 @@ fn strip_test_functions(krate: ast::Crate) -> ast::Crate {
 fn is_test_fn(cx: &TestCtxt, i: &ast::Item) -> bool {
     let has_test_attr = attr::contains_name(i.attrs.as_slice(), "test");
 
-    #[deriving(PartialEq)]
-    enum HasTestSignature {
-        Yes,
-        No,
-        NotEvenAFunction,
-    }
-
-    fn has_test_signature(i: &ast::Item) -> HasTestSignature {
+    fn has_test_signature(i: &ast::Item) -> bool {
         match &i.node {
           &ast::ItemFn(ref decl, _, _, ref generics, _) => {
             let no_output = match decl.output.node {
                 ast::TyNil => true,
-                _ => false,
+                _ => false
             };
-            if decl.inputs.is_empty()
-                   && no_output
-                   && !generics.is_parameterized() {
-                Yes
-            } else {
-                No
-            }
+            decl.inputs.is_empty()
+                && no_output
+                && !generics.is_parameterized()
           }
-          _ => NotEvenAFunction,
+          _ => false
         }
     }
 
-    if has_test_attr {
+    if has_test_attr && !has_test_signature(i) {
         let diag = cx.span_diagnostic;
-        match has_test_signature(i) {
-            Yes => {},
-            No => diag.span_err(i.span, "functions used as tests must have signature fn() -> ()"),
-            NotEvenAFunction => diag.span_err(i.span,
-                                              "only functions may be used as tests"),
-        }
+        diag.span_err(
+            i.span,
+            "functions used as tests must have signature fn() -> ()."
+        );
     }
 
-    return has_test_attr && has_test_signature(i) == Yes;
+    return has_test_attr && has_test_signature(i);
 }
 
 fn is_bench_fn(cx: &TestCtxt, i: &ast::Item) -> bool {

branches/release-prep/src/test/compile-fail/issue-13482.rs

@@ -12,7 +12,7 @@ fn main() {
   let x = [1,2];
   let y = match x {
     [] => None,
-//~^ ERROR expected `[<generic integer #0>, ..2]`, found a fixed array pattern of size 0
+//~^ ERROR expected `[<generic integer #0>, ..2]`, found a fixed vector pattern of size 0
     [a,_] => Some(a)
   };
 }

branches/release-prep/src/test/compile-fail/issue-14772.rs

@@ -10,6 +10,6 @@
 
 fn main() {
     match () {
-        [()] => { } //~ ERROR mismatched types: expected `()`, found an array pattern
+        [()] => { } //~ ERROR mismatched types: expected `()`, found a vector pattern
     }
 }

branches/release-prep/src/test/compile-fail/issue-15524.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//error-pattern:discriminant value
+//error-pattern:discriminant value already exists
 
 // black and white have the same discriminator value ...