---

yaml
---
r: 216567
b: refs/heads/stable
c: e6c23bb
h: refs/heads/master
i:
  216565: 169136b
  216563: 954880d
  216559: eba349f
v: v3

Author: alexcrichton

[refs]

@@ -29,5 +29,5 @@ refs/heads/tmp: 378a370ff2057afeb1eae86eb6e78c476866a4a6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 9b481f89d104963e0b91c234ce9c8f2eb2216f15
+refs/heads/stable: e6c23bb8939213653e58031430606059700da8ea
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375

branches/stable/src/librustc_trans/back/link.rs

@@ -1078,7 +1078,7 @@ fn add_local_native_libraries(cmd: &mut Command, sess: &Session) {
     sess.target_filesearch(PathKind::All).for_each_lib_search_path(|path, k| {
         match k {
             PathKind::Framework => { cmd.arg("-F").arg(path); }
-            _ => { cmd.arg("-L").arg(path); }
+            _ => { cmd.arg("-L").arg(&fix_windows_verbatim_for_gcc(path)); }
         }
         FileDoesntMatch
     });

branches/stable/src/test/auxiliary/issue-19163.rs

@@ -14,6 +14,8 @@
 // for `ByRef`. The right answer was to consider the result ambiguous
 // until more type information was available.
 
+// ignore-pretty -- FIXME(#17362)
+
 #![feature(lang_items, unboxed_closures)]
 #![no_implicit_prelude]
 

branches/stable/src/test/compile-fail/issue-12511.rs

@@ -14,6 +14,8 @@
 // for `ByRef`. The right answer was to consider the result ambiguous
 // until more type information was available.
 
+// ignore-pretty -- FIXME(#17362) pretty prints with `<<` which lexes wrong
+
 #![feature(lang_items, unboxed_closures)]
 #![no_implicit_prelude]
 

branches/stable/src/test/compile-fail/issue-17959.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// no-pretty-expanded FIXME #15189
+
+
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 enum ES<T> {
     ES1 { x: T },

branches/stable/src/test/compile-fail/issue-19109.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// no-pretty-expanded FIXME #15189
+
+
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 struct S<T> {
     x: T,

branches/stable/src/test/compile-fail/issue-19163.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// no-pretty-expanded FIXME #15189
+
+
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 struct TS<T>(T,T);
 

branches/stable/src/test/compile-fail/issue-19380.rs

@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-test FIXME #11820: & is unreliable in deriving
+
 use std::cmp::Ordering::{Less,Equal,Greater};
 
-#[derive(PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Eq,Ord)]
 struct A<'a> {
     x: &'a isize
 }

branches/stable/src/test/run-make/issue-18943/Makefile

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-pretty FIXME(#14193)
+
 #![allow(unknown_features)]
 #![feature(box_syntax)]
 

branches/stable/src/test/run-make/issue-18943/foo.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-pretty -- FIXME(#17362) pretty prints as `Hash<<Self as Hasher...` which fails to parse
+
 pub trait Hasher {
     type State;
 

branches/stable/src/test/run-pass/associated-types-impl-redirect.rs

@@ -20,6 +20,7 @@ struct A { a: Box<isize> }
 fn foo() -> Box<FnMut() -> isize + 'static> {
     let k: Box<_> = box 22;
     let _u = A {a: k.clone()};
+    // FIXME(#16640) suffix in `22` suffix shouldn't be necessary
     let result  = || 22;
     // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
     Box::new(result)

branches/stable/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs

@@ -17,6 +17,9 @@ use std::default::Default;
 use std::iter::FromIterator;
 use std::ops::Add;
 use std::option::IntoIter as OptionIter;
+// FIXME the glob std::prelude::*; import of Vec is missing non-static inherent
+// methods.
+use std::vec::Vec;
 
 pub struct XorShiftRng;
 use XorShiftRng as DummyRng;
@@ -78,10 +81,11 @@ tests! {
     Vec::map_in_place, fn(Vec<u8>, fn(u8) -> i8) -> Vec<i8>, (vec![b'f', b'o', b'o'], u8_as_i8);
     Vec::map_in_place::<i8, fn(u8) -> i8>, fn(Vec<u8>, fn(u8) -> i8) -> Vec<i8>,
         (vec![b'f', b'o', b'o'], u8_as_i8);
-    Vec::<u8>::map_in_place, fn(Vec<u8>, fn(u8) -> i8) -> Vec<i8>
-        , (vec![b'f', b'o', b'o'], u8_as_i8);
-    Vec::<u8>::map_in_place::<i8, fn(u8) -> i8>, fn(Vec<u8>, fn(u8) -> i8) -> Vec<i8>
-        , (vec![b'f', b'o', b'o'], u8_as_i8);
+    // FIXME these break with "type parameter might not appear here pointing at `<u8>`.
+    // Vec::<u8>::map_in_place: fn(Vec<u8>, fn(u8) -> i8) -> Vec<i8>
+    //    , (vec![b'f', b'o', b'o'], u8_as_i8);
+    // Vec::<u8>::map_in_place::<i8, fn(u8) -> i8>: fn(Vec<u8>, fn(u8) -> i8) -> Vec<i8>
+    //    , (vec![b'f', b'o', b'o'], u8_as_i8);
 
     // Trait static methods.
     bool::size, fn() -> usize, ();

branches/stable/src/test/run-pass/deriving-cmp-generic-struct-enum.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// no-pretty-expanded FIXME #15189
+
+
 #![feature(core)]
 
 use std::iter::Unfold;

branches/stable/src/test/run-pass/deriving-cmp-generic-struct.rs

@@ -7,6 +7,8 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+//
+// no-pretty-expanded FIXME #15189
 
 pub fn main() {
     let yen: char = '¥'; // 0xa5

branches/stable/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs

@@ -11,22 +11,18 @@
 
 use std::mem::size_of;
 
-#[cfg(not(target_pointer_width = "64"))]
-fn test_big_vec() {}
-
-#[cfg(target_pointer_width = "64")]
-fn test_big_vec()
-{
-    assert_eq!(size_of::<[u8; (1 << 32)]>(), (1 << 32));
-}
-
-fn main() {
+pub fn main() {
     let x: [isize; 4] = [1, 2, 3, 4];
     assert_eq!(x[0], 1);
     assert_eq!(x[1], 2);
     assert_eq!(x[2], 3);
     assert_eq!(x[3], 4);
 
     assert_eq!(size_of::<[u8; 4]>(), 4);
-    test_big_vec();
+
+    // FIXME #10183
+    // FIXME #18069
+    //if cfg!(target_pointer_width = "64") {
+    //    assert_eq!(size_of::<[u8; (1 << 32)]>(), (1 << 32));
+    //}
 }