Accepting request 746768 from home:aplanas:branches:devel:languages:rust

- Add hopefully-fix-rustdoc-build.patch to fix rustdoc compilation
- Update to version 1.39.0
  + Language
    - You can now create async functions and blocks with async fn,
      async move {}, and async {} respectively, and you can now call
      .await on async expressions.
    - You can now use certain attributes on function, closure, and
      function pointer parameters.
    - You can now take shared references to bind-by-move patterns in
      the if guards of match arms.
  + Compiler
    - Added tier 3 support for the i686-unknown-uefi target.
    - Added tier 3 support for the sparc64-unknown-openbsd target.
    - rustc will now trim code snippets in diagnostics to fit in your
      terminal.
    - You can now pass --show-output argument to test binaries to
      print the output of successful tests.
  + For more details:
    https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1390-2019-11-07
- Drop patches already merged in upstream:
  + rust-61206-assume-tarball-llvm-is-fresh.patch
  + add-option-to-allow-warnings.patch

OBS-URL: https://build.opensuse.org/request/show/746768
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=233

add-option-to-allow-warnings.patch

@@ -1,112 +0,0 @@
-From 935c1c86070dfac3515a4296bf991cdf544bae27 Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Tue, 27 Aug 2019 09:37:51 +0200
-Subject: [PATCH] rustbuild: allow disabling deny(warnings) for bootstrap
-
-When deny-warnings is not specified or set to true, the behaviour is the same as before.
-When deny-warnings is set to false, warnings are now allowed
-
-Fixes #63911
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
----
- src/bootstrap/bin/main.rs    | 3 ---
- src/bootstrap/bin/rustc.rs   | 8 +++-----
- src/bootstrap/bin/rustdoc.rs | 3 ---
- src/bootstrap/bootstrap.py   | 2 ++
- src/bootstrap/lib.rs         | 3 ---
- src/build_helper/lib.rs      | 3 ---
- 6 files changed, 5 insertions(+), 17 deletions(-)
-
-diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs
-index bd1a87c5744d..138b7f4b2610 100644
---- a/src/bootstrap/bin/main.rs
-+++ b/src/bootstrap/bin/main.rs
-@@ -5,9 +5,6 @@
- //! parent directory, and otherwise documentation can be found throughout the `build`
- //! directory in each respective module.
- 
--// NO-RUSTC-WRAPPER
--#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
--
- use std::env;
- 
- use bootstrap::{Config, Build};
-diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
-index ce92ce026967..8cb48df14bfe 100644
---- a/src/bootstrap/bin/rustc.rs
-+++ b/src/bootstrap/bin/rustc.rs
-@@ -15,9 +15,6 @@
- //! switching compilers for the bootstrap and for build scripts will probably
- //! never get replaced.
- 
--// NO-RUSTC-WRAPPER
--#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
--
- use std::env;
- use std::ffi::OsString;
- use std::io;
-@@ -124,8 +121,9 @@ fn main() {
- 
-     if env::var_os("RUSTC_DENY_WARNINGS").is_some() &&
-        env::var_os("RUSTC_EXTERNAL_TOOL").is_none() {
--        // When extending this list, search for `NO-RUSTC-WRAPPER` and add the new lints
--        // there as well, some code doesn't go through this `rustc` wrapper.
-+        // When extending this list, add the new lints to the RUSTFLAGS of the
-+        // build_bootstrap function of src/bootstrap/bootstrap.py as well as
-+        // some code doesn't go through this `rustc` wrapper.
-         cmd.arg("-Dwarnings");
-         cmd.arg("-Drust_2018_idioms");
-         cmd.arg("-Dunused_lifetimes");
-diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
-index ff38ee8788f5..766a3463ecd8 100644
---- a/src/bootstrap/bin/rustdoc.rs
-+++ b/src/bootstrap/bin/rustdoc.rs
-@@ -2,9 +2,6 @@
- //!
- //! See comments in `src/bootstrap/rustc.rs` for more information.
- 
--// NO-RUSTC-WRAPPER
--#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
--
- use std::env;
- use std::process::Command;
- use std::path::PathBuf;
-diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index 86901792d797..3c56131396f2 100644
---- a/src/bootstrap/bootstrap.py
-+++ b/src/bootstrap/bootstrap.py
-@@ -631,6 +631,8 @@ def build_bootstrap(self):
-         target_linker = self.get_toml("linker", build_section)
-         if target_linker is not None:
-             env["RUSTFLAGS"] += "-C linker=" + target_linker + " "
-+        if self.get_toml("deny-warnings", "rust") != "false":
-+            env["RUSTFLAGS"] += "-Dwarnings -Drust_2018_idioms -Dunused_lifetimes "
- 
-         env["PATH"] = os.path.join(self.bin_root(), "bin") + \
-             os.pathsep + env["PATH"]
-diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index c0e0ad1a857b..575844028d56 100644
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
-@@ -103,9 +103,6 @@
- //! More documentation can be found in each respective module below, and you can
- //! also check out the `src/bootstrap/README.md` file for more information.
- 
--// NO-RUSTC-WRAPPER
--#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
--
- #![feature(core_intrinsics)]
- #![feature(drain_filter)]
- 
-diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs
-index 131d2034675e..f035a7119188 100644
---- a/src/build_helper/lib.rs
-+++ b/src/build_helper/lib.rs
-@@ -1,6 +1,3 @@
--// NO-RUSTC-WRAPPER
--#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
--
- use std::fs::File;
- use std::path::{Path, PathBuf};
- use std::process::{Command, Stdio};

hopefully-fix-rustdoc-build.patch

@@ -0,0 +1,35 @@
+From 73369f32621f6a844a80a8513ae3ded901e4a406 Mon Sep 17 00:00:00 2001
+From: Mark Rousskov <mark.simulacrum@gmail.com>
+Date: Tue, 5 Nov 2019 11:16:46 -0500
+Subject: [PATCH] Hopefully fix rustdoc build
+
+It's super unclear why this broke when we switched to beta but not
+previously -- but at least it's hopefully fixed now.
+---
+ src/bootstrap/builder.rs | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+Index: rustc-1.39.0-src/src/bootstrap/builder.rs
+===================================================================
+--- rustc-1.39.0-src.orig/src/bootstrap/builder.rs
++++ rustc-1.39.0-src/src/bootstrap/builder.rs
+@@ -875,7 +875,18 @@ impl<'a> Builder<'a> {
+         // things still build right, please do!
+         match mode {
+             Mode::Std => metadata.push_str("std"),
+-            _ => {},
++            // When we're building rustc tools, they're built with a search path
++            // that contains things built during the rustc build. For example,
++            // bitflags is built during the rustc build, and is a dependency of
++            // rustdoc as well. We're building rustdoc in a different target
++            // directory, though, which means that Cargo will rebuild the
++            // dependency. When we go on to build rustdoc, we'll look for
++            // bitflags, and find two different copies: one built during the
++            // rustc step and one that we just built. This isn't always a
++            // problem, somehow -- not really clear why -- but we know that this
++            // fixes things.
++            Mode::ToolRustc => metadata.push_str("tool-rustc"),
++            _ => {}
+         }
+         cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);
+ 

ignore-Wstring-conversion.patch

@@ -1,17 +1,17 @@
-*** rustc-1.30.0-src/src/librustc_llvm/build.rs	2018-10-25 09:00:01.000000000 +1300
+Index: rustc-1.39.0-src/src/librustc_llvm/build.rs
---- rust-patch/src/librustc_llvm/build.rs	2018-11-05 07:31:35.672765505 +1300
+===================================================================
-***************
+--- rustc-1.39.0-src.orig/src/librustc_llvm/build.rs
-*** 147,152 ****
++++ rustc-1.39.0-src/src/librustc_llvm/build.rs
---- 147,158 ----
+@@ -137,6 +137,12 @@ fn main() {
-              continue;
+             continue;
-          }
+         }
-  
+ 
-+         // hack to avoid flag on openSUSE which is incompatible with GCC
++        // hack to avoid flag on openSUSE which is incompatible with GCC
-+         if flag.starts_with("-W") && flag.contains("string-conversion") {
++        if flag.starts_with("-W") && flag.contains("string-conversion") {
-+             continue;
++            continue;
-+         }
++        }
-+ 
++
-+ 
++
-          cfg.flag(flag);
+         cfg.flag(flag);
-      }
+     }
-  
+ 

rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aed553dbf457d8239eb3b01d4a2f422672772a0114aa43647294eca1b358d219
-size 124322996

rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4ed33497b3a3b89f5910fa140bbc9f4865ebf1735898bbe06266ef5944f6fca
-size 126583596

rust-1.37.0-i686-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f99daecd13c716b0c285b1c26225e71df2c7ca520a00285ba4c26ff767680ecb
-size 177419360

rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d784f998e93e18e2daf369097c30eb4718d8d2a71372b0f3d0da2869942f19ec
-size 124035536

rust-1.37.0-powerpc64-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:539492d5bfcd21261843028e4f53f753f57bb8ed45faee394701f27c01aef63b
-size 128662180

rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eecebeaa2100950196e604d5680f9a9e7b6e97c535c246011a2247fe6ce629fc
-size 131763436

rust-1.37.0-s390x-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e5bcf4181d0ae65ec7a20f727fc29a13c7a4864e69344a1bc19721053b7daaf
-size 141808296

rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b498a84947012064363607c29cdd2ba6fab9a5260212ec4a7151dafd0d079081
-size 165034364

rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ab06ff04cc41e612dd55f3358a1239be8cceb0ad8018996d39ae3e3b23156d2
+size 235231988

rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8b9ced4a6b6efe32ac41e2ec032f847223b48ead04dedd2172e08d98616a774
+size 243411104

rust-1.38.0-i686-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c488cea89cef760362868eb790896bdf31b3109e392f0d54b27b74bd214df33
+size 298169160

rust-1.38.0-powerpc-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4ef3d69c8f31cfecd697decedfc5663374f543cfdd0db3d090ebdd8172e10a5
+size 239750464

rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d14e0e4c334472a34a4a0943305ad8ef2a824bcd48ec92b71a11307a7be74b1
+size 240082008

rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c253cc0f9441ab6ef4c2457e0ef8748c076d7d1897ab8a8a7bbb00308603a2b
+size 244407488

rust-1.38.0-s390x-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:797c15038950f7a20abcc51c738fe5948a222c9847f01bce03ca0c76fe142879
+size 291685528

rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e9a2ef90679a66c9f8c62b113b018866303645a69c4812d8290d8a7162ea190
+size 279859784

rust-61206-assume-tarball-llvm-is-fresh.patch

@@ -1,73 +0,0 @@
-commit 53fe76479aab03b1fbe5b7184f45484886f769b1
-Author: Josh Stone <jistone@redhat.com>
-Date:   Wed Sep 4 16:02:31 2019 -0700
-
-    Assume non-git LLVM is fresh if the stamp file exists
-    
-    Rustbuild usually writes the LLVM submodule commit in a stamp file, so
-    we can avoid rebuilding it unnecessarily. However, for builds from a
-    source tarball (non-git), we were assuming a rebuild is always needed.
-    This can cause a lot of extra work if any environment like `CFLAGS`
-    changed between steps like build and install, which are often separate
-    in distro builds.
-    
-    Now we also write an empty stamp file if the git commit is unknown, and
-    its presence is trusted to indicate that no rebuild is needed. An info
-    message reports that this is happening, along with the stamp file path
-    that can be deleted to force a rebuild anyway.
-
-diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
-index f02def3e1b0..7bf9ea2688f 100644
---- a/src/bootstrap/native.rs
-+++ b/src/bootstrap/native.rs
-@@ -81,26 +81,29 @@ impl Step for Llvm {
-             (info, "src/llvm-project/llvm", builder.llvm_out(target), dir.join("bin"))
-         };
- 
--        if !llvm_info.is_git() {
--            println!(
--                "git could not determine the LLVM submodule commit hash. \
--                Assuming that an LLVM build is necessary.",
--            );
--        }
--
-         let build_llvm_config = llvm_config_ret_dir
-             .join(exe("llvm-config", &*builder.config.build));
-         let done_stamp = out_dir.join("llvm-finished-building");
- 
--        if let Some(llvm_commit) = llvm_info.sha() {
--            if done_stamp.exists() {
-+        if done_stamp.exists() {
-+            if let Some(llvm_commit) = llvm_info.sha() {
-                 let done_contents = t!(fs::read(&done_stamp));
- 
-                 // If LLVM was already built previously and the submodule's commit didn't change
-                 // from the previous build, then no action is required.
-                 if done_contents == llvm_commit.as_bytes() {
--                    return build_llvm_config
-+                    return build_llvm_config;
-                 }
-+            } else {
-+                builder.info(
-+                    "Could not determine the LLVM submodule commit hash. \
-+                     Assuming that an LLVM rebuild is not necessary.",
-+                );
-+                builder.info(&format!(
-+                    "To force LLVM to rebuild, remove the file `{}`",
-+                    done_stamp.display()
-+                ));
-+                return build_llvm_config;
-             }
-         }
- 
-@@ -303,9 +306,7 @@ impl Step for Llvm {
- 
-         cfg.build();
- 
--        if let Some(llvm_commit) = llvm_info.sha() {
--            t!(fs::write(&done_stamp, llvm_commit));
--        }
-+        t!(fs::write(&done_stamp, llvm_info.sha().unwrap_or("")));
- 
-         build_llvm_config
-     }

rust.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Fri Nov  8 23:43:13 UTC 2019 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Add hopefully-fix-rustdoc-build.patch to fix rustdoc compilation
+
+-------------------------------------------------------------------
+Thu Nov  7 15:33:25 UTC 2019 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Update to version 1.39.0
+  + Language
+    - You can now create async functions and blocks with async fn,
+      async move {}, and async {} respectively, and you can now call
+      .await on async expressions.
+    - You can now use certain attributes on function, closure, and
+      function pointer parameters.
+    - You can now take shared references to bind-by-move patterns in
+      the if guards of match arms.
+  + Compiler
+    - Added tier 3 support for the i686-unknown-uefi target.
+    - Added tier 3 support for the sparc64-unknown-openbsd target.
+    - rustc will now trim code snippets in diagnostics to fit in your
+      terminal.
+    - You can now pass --show-output argument to test binaries to
+      print the output of successful tests.
+  + For more details:
+    https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1390-2019-11-07
+- Drop patches already merged in upstream:
+  + rust-61206-assume-tarball-llvm-is-fresh.patch
+  + add-option-to-allow-warnings.patch
+
 -------------------------------------------------------------------
 Wed Oct 23 09:56:33 UTC 2019 - Ralf Haferkamp <rhafer@suse.com>
 

rust.spec

@@ -17,11 +17,11 @@
 #
 
 
-%global version_current 1.38.0
+%global version_current 1.39.0
-%global version_previous 1.37.0
+%global version_previous 1.38.0
-%global version_bootstrap 1.37.0
+%global version_bootstrap 1.38.0
-# some sub-packages are versioned independantly
+# some sub-packages are versioned independently
-%global rustfmt_version 1.0.3
+%global rustfmt_version 1.4.8
 %global clippy_version 0.0.212
 # Build the rust target triple.
 # Some rust arches don't match what SUSE labels them.
@@ -122,10 +122,8 @@ Source107:      %{dl_url}/rust-%{version_bootstrap}-s390x-unknown-linux-gnu.tar.
 Source108:      %{dl_url}/rust-%{version_bootstrap}-powerpc-unknown-linux-gnu.tar.xz
 # PATCH-FIX-OPENSUSE: edit src/librustc_llvm/build.rs to ignore GCC incompatible flag
 Patch0:         ignore-Wstring-conversion.patch
-# PATCH-FIX-UPSTREAM: Fix bug with timestamps which caused LLVM to rebuild - https://github.com/rust-lang/rust/issues/61206
+# PATCH-FIX-UPSTREAM: fix rustdoc compilation: https://github.com/rust-lang/rust/issues/66224
-Patch1:         rust-61206-assume-tarball-llvm-is-fresh.patch
+Patch1:         hopefully-fix-rustdoc-build.patch
-# PATCH-FIX-UPSTREAM: Adds an option to ignore warnings, primaraily used in this build to allow v1.38 to bootstrap itself
-Patch2:         add-option-to-allow-warnings.patch
 BuildRequires:  ccache
 # Leap 42 to 42.3, SLE12 SP1, SP2
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120200
@@ -376,7 +374,6 @@ This package includes HTML documentation for Cargo.
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # use python3
 sed -i -e "1s|#!.*|#!%{_bindir}/python3|" x.py

rustc-1.38.0-src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a7991aa4cb44ef941d71636e45a95468b520dc6fc7cf725364925bd3e3d3a34
-size 96163304

rustc-1.39.0-src.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b0dbb356070687a606034f71dc032b783bbf8b5d3f9fff39f2c1fbc4f171c29
+size 96495140