beta test

0001-Compiletest-bump-to-stage0-bootstrap-libtest.patch

@@ -1,32 +0,0 @@
-From f6832adadb84364ce0c81fa02910b3706f441abc Mon Sep 17 00:00:00 2001
-From: Mark Rousskov <mark.simulacrum@gmail.com>
-Date: Wed, 6 Nov 2019 15:17:02 -0500
-Subject: [PATCH] Compiletest bump to stage0 bootstrap libtest
-
----
- src/tools/compiletest/src/main.rs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
-index 34435819a2c4..b115539b4af3 100644
---- a/src/tools/compiletest/src/main.rs
-+++ b/src/tools/compiletest/src/main.rs
-@@ -568,6 +568,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
-         skip: vec![],
-         list: false,
-         options: test::Options::new(),
-+        time_options: None,
-     }
- }
- 
-@@ -703,6 +704,7 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> Vec<test::TestDescAn
-                     ignore,
-                     should_panic,
-                     allow_fail: false,
-+                    test_type: test::TestType::Unknown,
-                 },
-                 testfn: make_test_closure(config, early_props.ignore, testpaths, revision),
-             }
--- 
-2.24.1
-

0001-Fix-compiletest-fallout-from-stage0-bump.patch

@@ -0,0 +1,24 @@
+From 241d2e765dc7401e642812e43b75dbc3950f2c98 Mon Sep 17 00:00:00 2001
+From: Mark Rousskov <mark.simulacrum@gmail.com>
+Date: Wed, 18 Dec 2019 13:28:14 -0500
+Subject: [PATCH] Fix compiletest fallout from stage0 bump
+
+---
+ src/tools/compiletest/src/main.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
+index 15f8abd75d59..32965bbb292d 100644
+--- a/src/tools/compiletest/src/main.rs
++++ b/src/tools/compiletest/src/main.rs
+@@ -569,6 +569,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
+         list: false,
+         options: test::Options::new(),
+         time_options: None,
++        force_run_in_process: false,
+     }
+ }
+ 
+-- 
+2.24.1
+

rust-pr57840-llvm7-debuginfo-variants.patch

@@ -29,4 +29,4 @@ index 6deedd0b5ea3..9f63038c3623 100644
 +        || llvm_util::get_major_version() < 8;
  }
  
- // Describes the members of an enum value: An enum is described as a union of
+ // FIXME(eddyb) maybe precompute this? Right now it's computed once

rust-pr66317-bindir-relative.patch

@@ -1,39 +0,0 @@
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 2748903f2d47..10d02d6db829 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -1231,7 +1231,8 @@ impl<'a> Builder<'a> {
-             cargo.arg("--frozen");
-         }
- 
--        cargo.env("RUSTC_INSTALL_BINDIR", &self.config.bindir);
-+        // Try to use a sysroot-relative bindir, in case it was configured absolutely.
-+        cargo.env("RUSTC_INSTALL_BINDIR", self.config.bindir_relative());
- 
-         self.ci_env.force_coloring_in_ci(&mut cargo);
- 
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index d1bdfa0a7676..0c03b95c7b25 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -647,6 +647,20 @@ impl Config {
-         config
-     }
- 
-+    /// Try to find the relative path of `bindir`, otherwise return it in full.
-+    pub fn bindir_relative(&self) -> &Path {
-+        let bindir = &self.bindir;
-+        if bindir.is_absolute() {
-+            // Try to make it relative to the prefix.
-+            if let Some(prefix) = &self.prefix {
-+                if let Ok(stripped) = bindir.strip_prefix(prefix) {
-+                    return stripped;
-+                }
-+            }
-+        }
-+        bindir
-+    }
-+
-     /// Try to find the relative path of `libdir`.
-     pub fn libdir_relative(&self) -> Option<&Path> {
-         let libdir = self.libdir.as_ref()?;

rust.spec

@@ -9,10 +9,10 @@
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.39.0
-%global bootstrap_cargo 1.39.0
-%global bootstrap_channel 1.39.0
-%global bootstrap_date 2019-11-07
+%global bootstrap_rust 1.40.0
+%global bootstrap_cargo 1.40.0
+%global bootstrap_channel 1.40.0
+%global bootstrap_date 2019-12-16
 
 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@@ -21,7 +21,7 @@
 %bcond_with llvm_static
 
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient.  Rust currently requires LLVM 6.0+.
+# is insufficient.  Rust currently requires LLVM 7.0+.
 %if 0%{?rhel} && !0%{?epel}
 %bcond_without bundled_llvm
 %else
@@ -48,8 +48,8 @@
 %endif
 
 Name:           rust
-Version:        1.40.0
-Release:        3%{?dist}
+Version:        1.41.0
+Release:        0.beta.3%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -67,19 +67,15 @@ Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
 # We do have the necessary fix in our LLVM 7.
 Patch1:         rust-pr57840-llvm7-debuginfo-variants.patch
 
-# Fix the bindir used by rustdoc to find rustc
-# https://github.com/rust-lang/rust/pull/66317
-Patch2:         rust-pr66317-bindir-relative.patch
-
 # Fix compiletest with newer (local-rebuild) libtest
-# https://github.com/rust-lang/rust/pull/66156/commits/f6832adadb84364ce0c81fa02910b3706f441abc
-Patch3:         0001-Compiletest-bump-to-stage0-bootstrap-libtest.patch
+# https://github.com/rust-lang/rust/commit/241d2e765dc7401e642812e43b75dbc3950f2c98
+Patch2:         0001-Fix-compiletest-fallout-from-stage0-bump.patch
 # https://github.com/rust-lang/rust/pull/68019
-Patch4:         rust-pr68019-in-tree-compiletest.patch
+Patch3:         rust-pr68019-in-tree-compiletest.patch
 
 # Fix ARM unwinding for foreign-exceptions
 # https://github.com/rust-lang/rust/pull/67779
-Patch5:         0001-Update-the-barrier-cache-during-ARM-EHABI-unwinding.patch
+Patch4:         0001-Update-the-barrier-cache-during-ARM-EHABI-unwinding.patch
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -161,7 +157,7 @@ BuildRequires:  %{python}
 
 %if %with bundled_llvm
 BuildRequires:  cmake3 >= 3.4.3
-Provides:       bundled(llvm) = 8.0.0
+Provides:       bundled(llvm) = 9.0.0
 %else
 BuildRequires:  cmake >= 2.8.11
 %if 0%{?epel}
@@ -173,7 +169,7 @@ BuildRequires:  cmake >= 2.8.11
 %global llvm llvm
 %global llvm_root %{_prefix}
 %endif
-BuildRequires:  %{llvm}-devel >= 6.0
+BuildRequires:  %{llvm}-devel >= 7.0
 %if %with llvm_static
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
@@ -414,7 +410,6 @@ test -f '%{local_rust_root}/bin/rustc'
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
@@ -628,7 +623,6 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.so
-%{rustlibdir}/%{rust_triple}/codegen-backends/
 %exclude %{_bindir}/*miri