---

yaml
---
r: 208186
b: refs/heads/snap-stage3
c: bf06163
h: refs/heads/master
v: v3

Author: carols10cents

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 50aada70f4bcd507cc73a7eabe5206f85dd377a4
+refs/heads/snap-stage3: bf06163ea7f41a54e7ef96ac9c5dfcd626299926
 refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/configure

@@ -19,11 +19,6 @@ err() {
     exit 1
 }
 
-run() {
-    msg "$@"
-    "$@"
-}
-
 need_ok() {
     if [ $? -ne 0 ]
     then
@@ -41,7 +36,8 @@ need_cmd() {
 make_dir() {
     if [ ! -d $1 ]
     then
-        run mkdir -p $1
+        msg "mkdir -p $1"
+        mkdir -p $1
     fi
 }
 
@@ -50,7 +46,8 @@ copy_if_changed() {
     then
         msg "leaving $2 unchanged"
     else
-        run cp -f $1 $2
+        msg "cp $1 $2"
+        cp -f $1 $2
         chmod u-w $2 # make copied artifact read-only
     fi
 }
@@ -60,7 +57,8 @@ move_if_changed() {
     then
         msg "leaving $2 unchanged"
     else
-        run mv -f $1 $2
+        msg "mv $1 $2"
+        mv -f $1 $2
         chmod u-w $2 # make moved artifact read-only
     fi
 }
@@ -735,20 +733,6 @@ then
    probe CFG_JAVAC            javac
 fi
 
-# the valgrind rpass tests will fail if you don't have a valgrind, but they're
-# only disabled if you opt out.
-if [ -z "$CFG_VALGRIND" ]
-then
-    # If the user has explicitly asked for valgrind tests, then fail
-    if [ -n "$CFG_ENABLE_VALGRIND" ] && [ -n "$CFG_ENABLE_VALGRIND_PROVIDED" ]
-    then
-        err "No valgrind present, but valgrind tests explicitly requested"
-    else
-        CFG_DISABLE_VALGRIND_RPASS=1
-        putvar CFG_DISABLE_VALGRIND_RPASS
-    fi
-fi
-
 if [ ! -z "$CFG_GDB" ]
 then
     # Store GDB's version

branches/snap-stage3/mk/dist.mk

@@ -52,7 +52,6 @@ PKG_FILES := \
       doc                                      \
       driver                                   \
       etc                                      \
-      error-index-generator                    \
       $(foreach crate,$(CRATES),lib$(crate))   \
       libcollectionstest                       \
       libcoretest                              \

branches/snap-stage3/mk/main.mk

@@ -195,7 +195,6 @@ ifndef CFG_DISABLE_VALGRIND_RPASS
   $(info cfg: valgrind-rpass command set to $(CFG_VALGRIND))
   CFG_VALGRIND_RPASS :=$(CFG_VALGRIND)
 else
-  $(info cfg: disabling valgrind run-pass tests)
   CFG_VALGRIND_RPASS :=
 endif
 

branches/snap-stage3/src/doc/grammar.md

@@ -329,7 +329,7 @@ view_item : extern_crate_decl | use_decl ;
 
 ```antlr
 extern_crate_decl : "extern" "crate" crate_name
-crate_name: ident | ( string_lit as ident )
+crate_name: ident | ( ident "as" ident )
 ```
 
 ##### Use declarations

branches/snap-stage3/src/doc/reference.md

@@ -752,11 +752,10 @@ provided in the `extern_crate_decl`.
 The external crate is resolved to a specific `soname` at compile time, and a
 runtime linkage requirement to that `soname` is passed to the linker for
 loading at runtime. The `soname` is resolved at compile time by scanning the
-compiler's library path and matching the optional `crateid` provided as a
-string literal against the `crateid` attributes that were declared on the
-external crate when it was compiled. If no `crateid` is provided, a default
-`name` attribute is assumed, equal to the `ident` given in the
-`extern_crate_decl`.
+compiler's library path and matching the optional `crateid` provided against
+the `crateid` attributes that were declared on the external crate when it was
+compiled. If no `crateid` is provided, a default `name` attribute is assumed,
+equal to the `ident` given in the `extern_crate_decl`.
 
 Three examples of `extern crate` declarations:
 

branches/snap-stage3/src/libcollections/slice.rs

@@ -80,6 +80,7 @@
 #![stable(feature = "rust1", since = "1.0.0")]
 
 use alloc::boxed::Box;
+use core::convert::AsRef;
 use core::clone::Clone;
 use core::cmp::Ordering::{self, Greater, Less};
 use core::cmp::{self, Ord, PartialEq};
@@ -1023,25 +1024,25 @@ pub trait SliceConcatExt<T: ?Sized> {
     fn connect(&self, sep: &T) -> Self::Output;
 }
 
-impl<T: Clone, V: Borrow<[T]>> SliceConcatExt<T> for [V] {
+impl<T: Clone, V: AsRef<[T]>> SliceConcatExt<T> for [V] {
     type Output = Vec<T>;
 
     fn concat(&self) -> Vec<T> {
-        let size = self.iter().fold(0, |acc, v| acc + v.borrow().len());
+        let size = self.iter().fold(0, |acc, v| acc + v.as_ref().len());
         let mut result = Vec::with_capacity(size);
         for v in self {
-            result.push_all(v.borrow())
+            result.push_all(v.as_ref())
         }
         result
     }
 
     fn connect(&self, sep: &T) -> Vec<T> {
-        let size = self.iter().fold(0, |acc, v| acc + v.borrow().len());
+        let size = self.iter().fold(0, |acc, v| acc + v.as_ref().len());
         let mut result = Vec::with_capacity(size + self.len());
         let mut first = true;
         for v in self {
             if first { first = false } else { result.push(sep.clone()) }
-            result.push_all(v.borrow())
+            result.push_all(v.as_ref())
         }
         result
     }

branches/snap-stage3/src/libcollections/str.rs

@@ -59,6 +59,7 @@ use core::str::pattern::Pattern;
 use core::str::pattern::{Searcher, ReverseSearcher, DoubleEndedSearcher};
 use rustc_unicode::str::{UnicodeStr, Utf16Encoder};
 
+use core::convert::AsRef;
 use vec_deque::VecDeque;
 use borrow::{Borrow, ToOwned};
 use string::String;
@@ -82,7 +83,7 @@ pub use core::str::pattern;
 Section: Creating a string
 */
 
-impl<S: Borrow<str>> SliceConcatExt<str> for [S] {
+impl<S: AsRef<str>> SliceConcatExt<str> for [S] {
     type Output = String;
 
     fn concat(&self) -> String {
@@ -91,11 +92,11 @@ impl<S: Borrow<str>> SliceConcatExt<str> for [S] {
         }
 
         // `len` calculation may overflow but push_str will check boundaries
-        let len = self.iter().map(|s| s.borrow().len()).sum();
+        let len = self.iter().map(|s| s.as_ref().len()).sum();
         let mut result = String::with_capacity(len);
 
         for s in self {
-            result.push_str(s.borrow())
+            result.push_str(s.as_ref())
         }
 
         result
@@ -114,7 +115,7 @@ impl<S: Borrow<str>> SliceConcatExt<str> for [S] {
         // this is wrong without the guarantee that `self` is non-empty
         // `len` calculation may overflow but push_str but will check boundaries
         let len = sep.len() * (self.len() - 1)
-            + self.iter().map(|s| s.borrow().len()).sum::<usize>();
+            + self.iter().map(|s| s.as_ref().len()).sum::<usize>();
         let mut result = String::with_capacity(len);
         let mut first = true;
 
@@ -124,7 +125,7 @@ impl<S: Borrow<str>> SliceConcatExt<str> for [S] {
             } else {
                 result.push_str(sep);
             }
-            result.push_str(s.borrow());
+            result.push_str(s.as_ref());
         }
         result
     }

branches/snap-stage3/src/libcollections/string.rs

@@ -1057,14 +1057,6 @@ impl AsRef<str> for String {
     }
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-impl AsRef<[u8]> for String {
-    #[inline]
-    fn as_ref(&self) -> &[u8] {
-        self.as_bytes()
-    }
-}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a> From<&'a str> for String {
     #[cfg(not(test))]

branches/snap-stage3/src/libcore/num/wrapping.rs

@@ -123,7 +123,6 @@ macro_rules! wrapping_impl {
         impl Not for Wrapping<$t> {
             type Output = Wrapping<$t>;
 
-            #[inline(always)]
             fn not(self) -> Wrapping<$t> {
                 Wrapping(!self.0)
             }

branches/snap-stage3/src/libcore/str/mod.rs

@@ -21,7 +21,6 @@ use self::pattern::{Searcher, ReverseSearcher, DoubleEndedSearcher};
 use char::CharExt;
 use clone::Clone;
 use cmp::{self, Eq};
-use convert::AsRef;
 use default::Default;
 use fmt;
 use iter::ExactSizeIterator;
@@ -1843,14 +1842,6 @@ impl StrExt for str {
     fn parse<T: FromStr>(&self) -> Result<T, T::Err> { FromStr::from_str(self) }
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-impl AsRef<[u8]> for str {
-    #[inline]
-    fn as_ref(&self) -> &[u8] {
-        self.as_bytes()
-    }
-}
-
 /// Pluck a code point out of a UTF-8-like byte slice and return the
 /// index of the next code point.
 #[inline]

branches/snap-stage3/src/librustdoc/html/render.rs

@@ -1643,7 +1643,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
             clean::ExternCrateItem(ref name, ref src) => {
                 match *src {
                     Some(ref src) => {
-                        try!(write!(w, "<tr><td><code>{}extern crate \"{}\" as {};",
+                        try!(write!(w, "<tr><td><code>{}extern crate {} as {};",
                                     VisSpace(myitem.visibility),
                                     src,
                                     name))