Merge branch 'rust' into 'master'

user/rust: Bump to 1.31.1

This needs updated binaries from https://portage.smaeul.xyz/distfiles/adelie/

See merge request !131

1 files changed, 20 insertions, 20 deletions

diff --git a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 2c8d75872..4c0a8dee0 100644
--- a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -1,7 +1,7 @@
-From ff1c6e9d50da8247f044b10d281f336c2c859f7c Mon Sep 17 00:00:00 2001
+From c822b31f554ed2f930be8625973a401fd438c123 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Fri, 8 Sep 2017 22:11:14 -0500
-Subject: [PATCH 05/24] Remove -nostdlib and musl_root from musl targets
+Subject: [PATCH 05/23] Remove -nostdlib and musl_root from musl targets
 
 ---
  config.toml.example                           |  6 ---
@@ -19,10 +19,10 @@ Subject: [PATCH 05/24] Remove -nostdlib and musl_root from musl targets
  12 files changed, 4 insertions(+), 188 deletions(-)
 
 diff --git a/config.toml.example b/config.toml.example
-index 3159c19528..a86db62c7b 100644
+index e8cb0cba6b..1971fea758 100644
 --- a/config.toml.example
 +++ b/config.toml.example
-@@ -431,12 +431,6 @@
+@@ -452,12 +452,6 @@
  # only use static libraries. If unset, the target's default linkage is used.
  #crt-static = false
  
@@ -36,7 +36,7 @@ index 3159c19528..a86db62c7b 100644
  # probably don't want to use this.
  #qemu-rootfs = "..."
 diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
-index b89976eca2..0838130039 100644
+index b6764c1aae..6fa60bd9a5 100644
 --- a/src/bootstrap/bin/rustc.rs
 +++ b/src/bootstrap/bin/rustc.rs
 @@ -30,7 +30,6 @@
@@ -123,7 +123,7 @@ index d5da0cabec..47cc31bded 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 608f2c982c..fea4c7ff72 100644
+index 69d45acded..7bb38ac7ec 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
 @@ -86,13 +86,6 @@ impl Step for Std {
@@ -186,19 +186,19 @@ index 608f2c982c..fea4c7ff72 100644
  }
  
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index cc6d76c76f..db53d09922 100644
+index a9d330e06a..745785a8ae 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -135,8 +135,6 @@ pub struct Config {
-     pub save_toolstates: Option<PathBuf>,
+@@ -136,8 +136,6 @@ pub struct Config {
      pub print_step_timings: bool,
+     pub missing_tools: bool,
  
 -    // Fallback musl-root for all targets
 -    pub musl_root: Option<PathBuf>,
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -170,7 +168,6 @@ pub struct Target {
+@@ -173,7 +171,6 @@ pub struct Target {
      pub linker: Option<PathBuf>,
      pub ndk: Option<PathBuf>,
      pub crt_static: Option<bool>,
@@ -206,7 +206,7 @@ index cc6d76c76f..db53d09922 100644
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
  }
-@@ -301,7 +298,6 @@ struct Rust {
+@@ -305,7 +302,6 @@ struct Rust {
      backtrace: Option<bool>,
      default_linker: Option<String>,
      channel: Option<String>,
@@ -214,7 +214,7 @@ index cc6d76c76f..db53d09922 100644
      rpath: Option<bool>,
      optimize_tests: Option<bool>,
      debuginfo_tests: Option<bool>,
-@@ -338,7 +334,6 @@ struct TomlTarget {
+@@ -343,7 +339,6 @@ struct TomlTarget {
      linker: Option<String>,
      android_ndk: Option<String>,
      crt_static: Option<bool>,
@@ -222,7 +222,7 @@ index cc6d76c76f..db53d09922 100644
      qemu_rootfs: Option<String>,
  }
  
-@@ -554,7 +549,6 @@ impl Config {
+@@ -560,7 +555,6 @@ impl Config {
              set(&mut config.llvm_tools_enabled, rust.llvm_tools);
              config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);
              config.rustc_default_linker = rust.default_linker.clone();
@@ -230,7 +230,7 @@ index cc6d76c76f..db53d09922 100644
              config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
              set(&mut config.deny_warnings, rust.deny_warnings.or(flags.warnings));
              set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -595,7 +589,6 @@ impl Config {
+@@ -604,7 +598,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.clone().map(PathBuf::from);
                  target.linker = cfg.linker.clone().map(PathBuf::from);
                  target.crt_static = cfg.crt_static.clone();
@@ -239,10 +239,10 @@ index cc6d76c76f..db53d09922 100644
  
                  config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index cf7f78eeba..70bc0f5a41 100755
+index 0cf84a6298..4845e93a0e 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -109,28 +109,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -112,28 +112,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
    "aarch64-linux-android NDK standalone path")
  v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
    "x86_64-linux-android NDK standalone path")
@@ -272,10 +272,10 @@ index cf7f78eeba..70bc0f5a41 100755
    "rootfs in qemu testing, you probably don't want to use this")
  v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 055a87efaa..5eb339ee00 100644
+index 30e84bc13f..cf6f410ccb 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -848,14 +848,6 @@ impl Build {
+@@ -861,14 +861,6 @@ impl Build {
          }
      }
  
@@ -291,7 +291,7 @@ index 055a87efaa..5eb339ee00 100644
      fn no_std(&self, target: Interned<String>) -> Option<bool> {
          self.config.target_config.get(&target)
 diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index c2610de23b..24e05e4250 100644
+index 724cb5841f..5af34e441c 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
 @@ -21,7 +21,7 @@
@@ -440,5 +440,5 @@ index 7a3f3c2a51..32fe2f880a 100644
      base.crt_static_default = true;
      // These targets allow the user to choose between static and dynamic linking.
 -- 
-2.18.0
+2.19.2