---

yaml
---
r: 236175
b: refs/heads/stable
c: 6109d05
h: refs/heads/master
i:
  236173: e65da19
  236171: f417168
  236167: 0787869
  236159: 61b581b
v: v3

Author: Dave Huseby

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 111fa82f35b45f5ce97cfcae64a349ceac46f3e6
+refs/heads/stable: 6109d0567d5b72c70762e5bac00497ed30adf1b9
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/doc/tarpl/repr-rust.md

@@ -31,8 +31,8 @@ type's size is a multiple of its alignment. For instance:
 ```rust
 struct A {
     a: u8,
-    b: u32,
-    c: u16,
+    c: u32,
+    b: u16,
 }
 ```
 

branches/stable/src/liblibc/lib.rs

@@ -1002,7 +1002,7 @@ pub mod types {
             }
             pub mod posix01 {
                 use types::common::c95::{c_void};
-                use types::common::c99::{uint32_t, int32_t};
+                use types::common::c99::{uint8_t, uint32_t, int32_t};
                 use types::os::arch::c95::{c_long, time_t};
                 use types::os::arch::posix88::{dev_t, gid_t, ino_t};
                 use types::os::arch::posix88::{mode_t, off_t};
@@ -1096,7 +1096,7 @@ pub mod types {
             }
             pub mod posix01 {
                 use types::common::c95::{c_void};
-                use types::common::c99::{uint32_t, int32_t};
+                use types::common::c99::{uint8_t, uint32_t, int32_t};
                 use types::os::arch::c95::{c_long, time_t};
                 use types::os::arch::posix88::{dev_t, gid_t, ino_t};
                 use types::os::arch::posix88::{mode_t, off_t};

branches/stable/src/librustc_trans/back/msvc/mod.rs

@@ -206,7 +206,7 @@ pub fn link_exe_cmd(sess: &Session) -> Command {
         return max_key
     }
 
-    fn get_windows_sdk_path() -> Option<(PathBuf, usize, Option<OsString>)> {
+    fn get_windows_sdk_path() -> Option<(PathBuf, usize)> {
         let key = r"SOFTWARE\Microsoft\Microsoft SDKs\Windows";
         let key = LOCAL_MACHINE.open(key.as_ref());
         let (n, k) = match key.ok().as_ref().and_then(max_version) {
@@ -217,29 +217,28 @@ pub fn link_exe_cmd(sess: &Session) -> Command {
         let major = parts.next().unwrap().parse::<usize>().unwrap();
         let _minor = parts.next().unwrap().parse::<usize>().unwrap();
         k.query_str("InstallationFolder").ok().map(|folder| {
-            let ver = k.query_str("ProductVersion");
-            (PathBuf::from(folder), major, ver.ok())
+            (PathBuf::from(folder), major)
         })
     }
 
     fn get_windows_sdk_lib_path(sess: &Session) -> Option<PathBuf> {
-        let (mut path, major, ver) = match get_windows_sdk_path() {
+        let (mut path, major) = match get_windows_sdk_path() {
             Some(p) => p,
             None => return None,
         };
         path.push("Lib");
         if major <= 7 {
             // In Windows SDK 7.x, x86 libraries are directly in the Lib folder,
-            // x64 libraries are inside, and it's not necessary to link against
+            // x64 libraries are inside, and it's not necessary to link agains
             // the SDK 7.x when targeting ARM or other architectures.
             let x86 = match &sess.target.target.arch[..] {
                 "x86" => true,
                 "x86_64" => false,
                 _ => return None,
             };
             Some(if x86 {path} else {path.join("x64")})
-        } else if major <= 8 {
-            // Windows SDK 8.x installs libraries in a folder whose names
+        } else {
+            // Windows SDK 8.x installes libraries in a folder whose names
             // depend on the version of the OS you're targeting. By default
             // choose the newest, which usually corresponds to the version of
             // the OS you've installed the SDK on.
@@ -252,42 +251,14 @@ pub fn link_exe_cmd(sess: &Session) -> Command {
             }).map(|path| {
                 path.join("um").join(extra)
             })
-        } else if let Some(mut ver) = ver {
-            // Windows SDK 10 splits the libraries into architectures the same
-            // as Windows SDK 8.x, except for the addition of arm64.
-            // Additionally, the SDK 10 is split by Windows 10 build numbers
-            // rather than the OS version like the SDK 8.x does.
-            let extra = match windows_sdk_v10_subdir(sess) {
-                Some(e) => e,
-                None => return None,
-            };
-            // To get the correct directory we need to get the Windows SDK 10
-            // version, and so far it looks like the "ProductVersion" of the SDK
-            // corresponds to the folder name that the libraries are located in
-            // except that the folder contains an extra ".0". For now just
-            // append a ".0" to look for find the directory we're in. This logic
-            // will likely want to be refactored one day.
-            ver.push(".0");
-            let p = path.join(ver).join("um").join(extra);
-            fs::metadata(&p).ok().map(|_| p)
-        } else { None }
-    }
-
-    fn windows_sdk_v8_subdir(sess: &Session) -> Option<&'static str> {
-        match &sess.target.target.arch[..] {
-            "x86" => Some("x86"),
-            "x86_64" => Some("x64"),
-            "arm" => Some("arm"),
-            _ => return None,
         }
     }
 
-    fn windows_sdk_v10_subdir(sess: &Session) -> Option<&'static str> {
+    fn windows_sdk_v8_subdir(sess: &Session) -> Option<&'static str> {
         match &sess.target.target.arch[..] {
             "x86" => Some("x86"),
             "x86_64" => Some("x64"),
             "arm" => Some("arm"),
-            "aarch64" => Some("arm64"), // FIXME - Check if aarch64 is correct
             _ => return None,
         }
     }

branches/stable/src/libsyntax/parse/parser.rs

@@ -4610,7 +4610,7 @@ impl<'a> Parser<'a> {
             None
         };
 
-        if opt_trait.is_some() && try!(self.eat(&token::DotDot) ){
+        if try!(self.eat(&token::DotDot) ){
             if generics.is_parameterized() {
                 self.span_err(impl_span, "default trait implementations are not \
                                           allowed to have generics");

branches/stable/src/snapshots.txt

@@ -1,5 +1,6 @@
 S 2015-07-26 a5c12f4
   bitrig-x86_64 8734eb41ffbe6ddc1120aa2910db4162ec9cf270
+  freebsd-i386 2fee22adec101e2f952a5548fd1437ce1bd8d26f
   freebsd-x86_64 bc50b0f8d7f6d62f4f5ffa136f5387f5bf6524fd
   linux-i386 3459275cdf3896f678e225843fa56f0d9fdbabe8
   linux-x86_64 e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c

branches/stable/src/test/parse-fail/empty-impl-semicolon.rs

@@ -10,4 +10,4 @@
 
 // compile-flags: -Z parse-only
 
-impl Foo; //~ ERROR expected one of `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `;`
+impl Foo; //~ ERROR expected one of `(`, `+`, `..`, `::`, `<`, `for`, `where`, or `{`, found `;`

branches/stable/src/test/parse-fail/issue-27255.rs

@@ -15,7 +15,7 @@ struct S {
 }
 
 impl Cmp, ToString for S {
-//~^ ERROR: expected one of `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `,`
+//~^ ERROR: expected one of `(`, `+`, `..`, `::`, `<`, `for`, `where`, or `{`, found `,`
   fn eq(&&other: S) { false }
   fn to_string(&self) -> String { "hi".to_string() }
 }

branches/stable/src/test/parse-fail/multitrait.rs

@@ -17,7 +17,7 @@ struct Bar;
 
 impl Foo + Owned for Bar {
 //~^ ERROR not a trait
-//~^^ ERROR expected one of `where` or `{`, found `Bar`
+//~^^ ERROR expected one of `..`, `where`, or `{`, found `Bar`
 }
 
 fn main() { }