---

yaml
---
r: 271453
b: refs/heads/auto
c: 7027521
h: refs/heads/master
i:
  271451: 2a12e98

Author: TimNN

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 98f0a9128f0fc6545de14a5de8f0e91675045e56
+refs/heads/auto: 7027521daa0e4b3891151a9e0700786febf1cfa2
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/configure

@@ -1034,7 +1034,7 @@ then
         if [ -n "$CFG_OSX_CLANG_VERSION" ]
         then
             case $CFG_OSX_CLANG_VERSION in
-                (7.0* | 7.1* | 7.2* | 7.3*)
+                (7.0* | 7.1* | 7.2*)
                 step_msg "found ok version of APPLE CLANG: $CFG_OSX_CLANG_VERSION"
                 ;;
                 (*)

branches/auto/src/compiletest/compiletest.rs

@@ -15,7 +15,6 @@
 #![feature(rustc_private)]
 #![feature(str_char)]
 #![feature(test)]
-#![feature(question_mark)]
 
 #![deny(warnings)]
 
@@ -281,16 +280,16 @@ fn collect_tests_from_dir(config: &Config,
                           -> io::Result<()> {
     // Ignore directories that contain a file
     // `compiletest-ignore-dir`.
-    for file in fs::read_dir(dir)? {
-        let file = file?;
+    for file in try!(fs::read_dir(dir)) {
+        let file = try!(file);
         if file.file_name() == *"compiletest-ignore-dir" {
             return Ok(());
         }
     }
 
-    let dirs = fs::read_dir(dir)?;
+    let dirs = try!(fs::read_dir(dir));
     for file in dirs {
-        let file = file?;
+        let file = try!(file);
         let file_path = file.path();
         debug!("inspecting file {:?}", file_path.display());
         if is_test(config, &file_path) {
@@ -311,11 +310,11 @@ fn collect_tests_from_dir(config: &Config,
             tests.push(make_test(config, &paths))
         } else if file_path.is_dir() {
             let relative_file_path = relative_dir_path.join(file.file_name());
-            collect_tests_from_dir(config,
-                                   base,
-                                   &file_path,
-                                   &relative_file_path,
-                                   tests)?;
+            try!(collect_tests_from_dir(config,
+                                        base,
+                                        &file_path,
+                                        &relative_file_path,
+                                        tests));
         }
     }
     Ok(())

branches/auto/src/doc/book/lifetimes.md

@@ -282,12 +282,14 @@ to it.
 
 ## Lifetime Elision
 
-Rust supports powerful local type inference in the bodies of functions but not in their item signatures. 
-It's forbidden to allow reasoning about types based on the item signature alone. 
-However, for ergonomic reasons, a very restricted secondary inference algorithm called 
-“lifetime elision” does apply when judging lifetimes. Lifetime elision is concerned solely to infer 
-lifetime parameters using three easily memorizable and unambiguous rules. This means lifetime elision 
-acts as a shorthand for writing an item signature, while not hiding
+Rust supports powerful local type inference in function bodies, but it’s
+forbidden in item signatures to allow reasoning about the types based on
+the item signature alone. However, for ergonomic reasons a very restricted
+secondary inference algorithm called “lifetime elision” applies in function
+signatures. It infers only based on the signature components themselves and not
+based on the body of the function, only infers lifetime parameters, and does
+this with only three easily memorizable and unambiguous rules. This makes
+lifetime elision a shorthand for writing an item signature, while not hiding
 away the actual types involved as full local inference would if applied to it.
 
 When talking about lifetime elision, we use the term *input lifetime* and

branches/auto/src/doc/book/patterns.md

@@ -1,7 +1,7 @@
 % Patterns
 
 Patterns are quite common in Rust. We use them in [variable
-bindings][bindings], [match expressions][match], and other places, too. Let’s go
+bindings][bindings], [match statements][match], and other places, too. Let’s go
 on a whirlwind tour of all of the things patterns can do!
 
 [bindings]: variable-bindings.html

branches/auto/src/libcore/fmt/builders.rs

@@ -29,7 +29,7 @@ impl<'a, 'b: 'a> fmt::Write for PadAdapter<'a, 'b> {
     fn write_str(&mut self, mut s: &str) -> fmt::Result {
         while !s.is_empty() {
             if self.on_newline {
-                self.fmt.write_str("    ")?;
+                try!(self.fmt.write_str("    "));
             }
 
             let split = match s.find('\n') {
@@ -42,7 +42,7 @@ impl<'a, 'b: 'a> fmt::Write for PadAdapter<'a, 'b> {
                     s.len()
                 }
             };
-            self.fmt.write_str(&s[..split])?;
+            try!(self.fmt.write_str(&s[..split]));
             s = &s[split..];
         }
 
@@ -169,10 +169,10 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
         if self.fields > 0 {
             self.result = self.result.and_then(|_| {
                 if self.is_pretty() {
-                    self.fmt.write_str("\n")?;
+                    try!(self.fmt.write_str("\n"));
                 }
                 if self.fields == 1 && self.empty_name {
-                    self.fmt.write_str(",")?;
+                    try!(self.fmt.write_str(","));
                 }
                 self.fmt.write_str(")")
             });

branches/auto/src/libcore/fmt/mod.rs

@@ -795,24 +795,24 @@ pub fn write(output: &mut Write, args: Arguments) -> Result {
         None => {
             // We can use default formatting parameters for all arguments.
             for (arg, piece) in args.args.iter().zip(pieces.by_ref()) {
-                formatter.buf.write_str(*piece)?;
-                (arg.formatter)(arg.value, &mut formatter)?;
+                try!(formatter.buf.write_str(*piece));
+                try!((arg.formatter)(arg.value, &mut formatter));
             }
         }
         Some(fmt) => {
             // Every spec has a corresponding argument that is preceded by
             // a string piece.
             for (arg, piece) in fmt.iter().zip(pieces.by_ref()) {
-                formatter.buf.write_str(*piece)?;
-                formatter.run(arg)?;
+                try!(formatter.buf.write_str(*piece));
+                try!(formatter.run(arg));
             }
         }
     }
 
     // There can be only one trailing string piece left.
     match pieces.next() {
         Some(piece) => {
-            formatter.buf.write_str(*piece)?;
+            try!(formatter.buf.write_str(*piece));
         }
         None => {}
     }
@@ -897,9 +897,9 @@ impl<'a> Formatter<'a> {
         // Writes the sign if it exists, and then the prefix if it was requested
         let write_prefix = |f: &mut Formatter| {
             if let Some(c) = sign {
-                f.buf.write_str(unsafe {
+                try!(f.buf.write_str(unsafe {
                     str::from_utf8_unchecked(c.encode_utf8().as_slice())
-                })?;
+                }));
             }
             if prefixed { f.buf.write_str(prefix) }
             else { Ok(()) }
@@ -910,26 +910,26 @@ impl<'a> Formatter<'a> {
             // If there's no minimum length requirements then we can just
             // write the bytes.
             None => {
-                write_prefix(self)?; self.buf.write_str(buf)
+                try!(write_prefix(self)); self.buf.write_str(buf)
             }
             // Check if we're over the minimum width, if so then we can also
             // just write the bytes.
             Some(min) if width >= min => {
-                write_prefix(self)?; self.buf.write_str(buf)
+                try!(write_prefix(self)); self.buf.write_str(buf)
             }
             // The sign and prefix goes before the padding if the fill character
             // is zero
             Some(min) if self.sign_aware_zero_pad() => {
                 self.fill = '0';
-                write_prefix(self)?;
+                try!(write_prefix(self));
                 self.with_padding(min - width, rt::v1::Alignment::Right, |f| {
                     f.buf.write_str(buf)
                 })
             }
             // Otherwise, the sign and prefix goes after the padding
             Some(min) => {
                 self.with_padding(min - width, rt::v1::Alignment::Right, |f| {
-                    write_prefix(f)?; f.buf.write_str(buf)
+                    try!(write_prefix(f)); f.buf.write_str(buf)
                 })
             }
         }
@@ -1008,13 +1008,13 @@ impl<'a> Formatter<'a> {
         };
 
         for _ in 0..pre_pad {
-            self.buf.write_str(fill)?;
+            try!(self.buf.write_str(fill));
         }
 
-        f(self)?;
+        try!(f(self));
 
         for _ in 0..post_pad {
-            self.buf.write_str(fill)?;
+            try!(self.buf.write_str(fill));
         }
 
         Ok(())
@@ -1033,7 +1033,7 @@ impl<'a> Formatter<'a> {
             if self.sign_aware_zero_pad() {
                 // a sign always goes first
                 let sign = unsafe { str::from_utf8_unchecked(formatted.sign) };
-                self.buf.write_str(sign)?;
+                try!(self.buf.write_str(sign));
 
                 // remove the sign from the formatted parts
                 formatted.sign = b"";
@@ -1065,19 +1065,19 @@ impl<'a> Formatter<'a> {
         }
 
         if !formatted.sign.is_empty() {
-            write_bytes(self.buf, formatted.sign)?;
+            try!(write_bytes(self.buf, formatted.sign));
         }
         for part in formatted.parts {
             match *part {
                 flt2dec::Part::Zero(mut nzeroes) => {
                     const ZEROES: &'static str = // 64 zeroes
                         "0000000000000000000000000000000000000000000000000000000000000000";
                     while nzeroes > ZEROES.len() {
-                        self.buf.write_str(ZEROES)?;
+                        try!(self.buf.write_str(ZEROES));
                         nzeroes -= ZEROES.len();
                     }
                     if nzeroes > 0 {
-                        self.buf.write_str(&ZEROES[..nzeroes])?;
+                        try!(self.buf.write_str(&ZEROES[..nzeroes]));
                     }
                 }
                 flt2dec::Part::Num(mut v) => {
@@ -1087,10 +1087,10 @@ impl<'a> Formatter<'a> {
                         *c = b'0' + (v % 10) as u8;
                         v /= 10;
                     }
-                    write_bytes(self.buf, &s[..len])?;
+                    try!(write_bytes(self.buf, &s[..len]));
                 }
                 flt2dec::Part::Copy(buf) => {
-                    write_bytes(self.buf, buf)?;
+                    try!(write_bytes(self.buf, buf));
                 }
             }
         }
@@ -1349,20 +1349,20 @@ impl Display for bool {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Debug for str {
     fn fmt(&self, f: &mut Formatter) -> Result {
-        f.write_char('"')?;
+        try!(f.write_char('"'));
         let mut from = 0;
         for (i, c) in self.char_indices() {
             let esc = c.escape_default();
             // If char needs escaping, flush backlog so far and write, else skip
             if esc.size_hint() != (1, Some(1)) {
-                f.write_str(&self[from..i])?;
+                try!(f.write_str(&self[from..i]));
                 for c in esc {
-                    f.write_char(c)?;
+                    try!(f.write_char(c));
                 }
                 from = i + c.len_utf8();
             }
         }
-        f.write_str(&self[from..])?;
+        try!(f.write_str(&self[from..]));
         f.write_char('"')
     }
 }
@@ -1377,9 +1377,9 @@ impl Display for str {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Debug for char {
     fn fmt(&self, f: &mut Formatter) -> Result {
-        f.write_char('\'')?;
+        try!(f.write_char('\''));
         for c in self.escape_default() {
-            f.write_char(c)?
+            try!(f.write_char(c))
         }
         f.write_char('\'')
     }

branches/auto/src/libcore/lib.rs

@@ -77,7 +77,6 @@
 #![feature(rustc_attrs)]
 #![feature(staged_api)]
 #![feature(unboxed_closures)]
-#![feature(question_mark)]
 
 #[macro_use]
 mod macros;

branches/auto/src/libcore/num/dec2flt/mod.rs

@@ -214,7 +214,7 @@ fn dec2flt<T: RawFloat>(s: &str) -> Result<T, ParseFloatError> {
     }
     let (sign, s) = extract_sign(s);
     let flt = match parse_decimal(s) {
-        ParseResult::Valid(decimal) => convert(decimal)?,
+        ParseResult::Valid(decimal) => try!(convert(decimal)),
         ParseResult::ShortcutToInf => T::infinity(),
         ParseResult::ShortcutToZero => T::zero(),
         ParseResult::Invalid => match s {

branches/auto/src/libcore/str/mod.rs

@@ -240,7 +240,7 @@ impl Utf8Error {
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn from_utf8(v: &[u8]) -> Result<&str, Utf8Error> {
-    run_utf8_validation(v)?;
+    try!(run_utf8_validation(v));
     Ok(unsafe { from_utf8_unchecked(v) })
 }
 

branches/auto/src/libgraphviz/lib.rs

@@ -295,7 +295,6 @@
 #![cfg_attr(not(stage0), deny(warnings))]
 
 #![feature(str_escape)]
-#![feature(question_mark)]
 
 use self::LabelText::*;
 
@@ -663,7 +662,7 @@ pub fn render_opts<'a, N, E, G, W>(g: &'a G,
 {
     fn writeln<W: Write>(w: &mut W, arg: &[&str]) -> io::Result<()> {
         for &s in arg {
-            w.write_all(s.as_bytes())?;
+            try!(w.write_all(s.as_bytes()));
         }
         write!(w, "\n")
     }
@@ -672,9 +671,9 @@ pub fn render_opts<'a, N, E, G, W>(g: &'a G,
         w.write_all(b"    ")
     }
 
-    writeln(w, &["digraph ", g.graph_id().as_slice(), " {"])?;
+    try!(writeln(w, &["digraph ", g.graph_id().as_slice(), " {"]));
     for n in g.nodes().iter() {
-        indent(w)?;
+        try!(indent(w));
         let id = g.node_id(n);
 
         let escaped = &g.node_label(n).to_dot_string();
@@ -703,12 +702,12 @@ pub fn render_opts<'a, N, E, G, W>(g: &'a G,
         }
 
         text.push(";");
-        writeln(w, &text)?;
+        try!(writeln(w, &text));
     }
 
     for e in g.edges().iter() {
         let escaped_label = &g.edge_label(e).to_dot_string();
-        indent(w)?;
+        try!(indent(w));
         let source = g.source(e);
         let target = g.target(e);
         let source_id = g.node_id(&source);
@@ -730,7 +729,7 @@ pub fn render_opts<'a, N, E, G, W>(g: &'a G,
         }
 
         text.push(";");
-        writeln(w, &text)?;
+        try!(writeln(w, &text));
     }
 
     writeln(w, &["}"])
@@ -960,7 +959,7 @@ mod tests {
         let mut writer = Vec::new();
         render(&g, &mut writer).unwrap();
         let mut s = String::new();
-        Read::read_to_string(&mut &*writer, &mut s)?;
+        try!(Read::read_to_string(&mut &*writer, &mut s));
         Ok(s)
     }