---

yaml
---
r: 232914
b: refs/heads/try
c: 52e7f55
h: refs/heads/master
v: v3

Author: mneumann

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 370fe2786109360f7c35b8ba552b83b773dd71d6
+refs/heads/try: 52e7f5553e85cc939b25b478f83c32b91dc3885e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libfmt_macros/lib.rs

@@ -190,7 +190,7 @@ impl<'a> Parser<'a> {
     /// String, but I think it does when this eventually uses conditions so it
     /// might as well start using it now.
     fn err(&mut self, msg: &str) {
-        self.errors.push(msg.to_owned());
+        self.errors.push(msg.to_string());
     }
 
     /// Optionally consumes the specified character. If the character is not at
@@ -353,7 +353,7 @@ impl<'a> Parser<'a> {
         } else {
             spec.ty = self.word();
         }
-        spec
+        return spec;
     }
 
     /// Parses a Count parameter at the current position. This does not check
@@ -417,19 +417,25 @@ impl<'a> Parser<'a> {
     fn integer(&mut self) -> Option<usize> {
         let mut cur = 0;
         let mut found = false;
-        while let Some((_, c)) = self.cur.clone().next() {
-            if let Some(i) = c.to_digit(10) {
-                cur = cur * 10 + i as usize;
-                found = true;
-                self.cur.next();
-            } else {
-                break
+        loop {
+            match self.cur.clone().next() {
+                Some((_, c)) => {
+                    match c.to_digit(10) {
+                        Some(i) => {
+                            cur = cur * 10 + i as usize;
+                            found = true;
+                            self.cur.next();
+                        }
+                        None => { break }
+                    }
+                }
+                None => { break }
             }
         }
         if found {
-            Some(cur)
+            return Some(cur);
         } else {
-            None
+            return None;
         }
     }
 }

branches/try/src/libstd/os/dragonfly/raw.rs

@@ -65,11 +65,11 @@ pub struct stat {
     #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_flags: fflags_t,
     #[stable(feature = "raw_ext", since = "1.1.0")]
-    pub st_gen: uint32_t,
+    pub st_gen: u32,
     #[stable(feature = "raw_ext", since = "1.1.0")]
-    pub st_lspare: int32_t,
+    pub st_lspare: i32,
     #[stable(feature = "raw_ext", since = "1.1.0")]
-    pub st_qspare1: int64_t,
+    pub st_qspare1: i64,
     #[stable(feature = "raw_ext", since = "1.1.0")]
-    pub st_qspare2: int64_t,
+    pub st_qspare2: i64,
 }