Rustup to rustc 1.42.0-nightly (9ae6cedb8 2019-12-23)

Author: bjorn3

patches/0017-Fix-libtest-compilation.patch

@@ -12,8 +12,8 @@ index 8b76080..9e65de2 100644
 --- a/src/libtest/lib.rs
 +++ b/src/libtest/lib.rs
 @@ -52,7 +52,7 @@ use std::fmt;
-     env,
-     io,
+ use std::{
+     env, io,
      io::prelude::Write,
 -    panic::{self, catch_unwind, AssertUnwindSafe, PanicInfo},
 +    panic::{self, PanicInfo},
@@ -79,15 +79,12 @@ index 8b76080..9e65de2 100644
      let exec_time = start.map(|start| {
          let duration = start.elapsed();
          TestExecTime(duration)
-@@ -1688,10 +1676,10 @@ fn spawn_test_subprocess(desc: TestDesc, report_time: bool, monitor_ch: Sender<M
+@@ -1688,7 +1676,7 @@ fn spawn_test_subprocess(desc: TestDesc, report_time: bool, monitor_ch: Sender<M
      monitor_ch.send(message).unwrap();
  }
 
- fn run_test_in_spawned_subprocess(
-     desc: TestDesc,
--    testfn: Box<dyn FnOnce() + Send>,
-+    testfn: Box<impl FnOnce() + Send + 'static>,
- ) -> ! {
+-fn run_test_in_spawned_subprocess(desc: TestDesc, testfn: Box<dyn FnOnce() + Send>) -> ! {
++fn run_test_in_spawned_subprocess(desc: TestDesc, testfn: Box<impl FnOnce() + Send + 'static>) -> ! {
      let builtin_panic_hook = panic::take_hook();
      let record_result = Arc::new(move |panic_info: Option<&'_ PanicInfo<'_>>| {
          let test_result = match panic_info {

patches/0023-core-Ignore-failing-tests.patch

@@ -137,7 +137,7 @@ index a17c094..5bb11d2 100644
  #[test]
 +#[ignore]
  fn from_str_issue7588() {
-     let u : Option<u8> = u8::from_str_radix("1000", 10).ok();
+     let u: Option<u8> = u8::from_str_radix("1000", 10).ok();
      assert_eq!(u, None);
 @@ -613,11 +614,9 @@ test_impl_try_from_signed_to_unsigned_err! { test_try_i64u32, i64, u32 }
  test_impl_try_from_signed_to_unsigned_err! { test_try_i128u8, i128, u8 }
@@ -152,21 +152,21 @@ index a17c094..5bb11d2 100644
      cfg_block! {
          #[cfg(target_pointer_width = "16")] {
 @@ -640,6 +639,7 @@ macro_rules! test_float {
-     ($modname: ident, $fty: ty, $inf: expr, $neginf: expr, $nan: expr) => { mod $modname {
-         // FIXME(nagisa): these tests should test for sign of -0.0
-         #[test]
-+        #[ignore]
-         fn min() {
-             assert_eq!((0.0 as $fty).min(0.0), 0.0);
-             assert_eq!((-0.0 as $fty).min(-0.0), -0.0);
+         mod $modname {
+             // FIXME(nagisa): these tests should test for sign of -0.0
+             #[test]
++            #[ignore]
+             fn min() {
+                 assert_eq!((0.0 as $fty).min(0.0), 0.0);
+                 assert_eq!((-0.0 as $fty).min(-0.0), -0.0);
 @@ -662,6 +662,7 @@ macro_rules! test_float {
-             assert!(($nan as $fty).min($nan).is_nan());
-         }
-         #[test]
-+        #[ignore]
-         fn max() {
-             assert_eq!((0.0 as $fty).max(0.0), 0.0);
-             assert_eq!((-0.0 as $fty).max(-0.0), -0.0);
+                 assert!(($nan as $fty).min($nan).is_nan());
+             }
+             #[test]
++            #[ignore]
+             fn max() {
+                 assert_eq!((0.0 as $fty).max(0.0), 0.0);
+                 assert_eq!((-0.0 as $fty).max(-0.0), -0.0);
 diff --git a/src/libcore/tests/time.rs b/src/libcore/tests/time.rs
 index fac70c4..9107a02 100644
 --- a/src/libcore/tests/time.rs

patches/0024-libstd-Revert-arg-initialization-on-linux-to-not-req.patch

@@ -12,14 +12,11 @@ diff --git a/src/libstd/sys/unix/args.rs b/src/libstd/sys/unix/args.rs
 index 2ed1585..b4b021a 100644
 --- a/src/libstd/sys/unix/args.rs
 +++ b/src/libstd/sys/unix/args.rs
-@@ -83,10 +83,7 @@ mod imp {
+@@ -83,7 +83,7 @@ mod imp {
          // On Linux-GNU, we rely on `ARGV_INIT_ARRAY` below to initialize
          // `ARGC` and `ARGV`. But in Miri that does not actually happen so we
          // still initialize here.
--        #[cfg(any(
--            miri,
--            not(all(target_os = "linux", target_env = "gnu"))
--        ))]
+-        #[cfg(any(miri, not(all(target_os = "linux", target_env = "gnu"))))]
 +        // `#[link_section]` is not yet supported by cg_clif
          really_init(_argc, _argv);
      }