diff --git a/cargo-help-clippy-should-have-description-to-user.patch b/cargo-help-clippy-should-have-description-to-user.patch index 13b6c8d21876da98e7499e2b49289f9c1e776037..5658c47257afa5b4be0cacffa1de88332f92e8c6 100644 --- a/cargo-help-clippy-should-have-description-to-user.patch +++ b/cargo-help-clippy-should-have-description-to-user.patch @@ -11,7 +11,7 @@ diff --git a/src/tools/cargo/src/bin/cargo/cli.rs b/src/tools/cargo/src/bin/carg index 243f6ac0..c2dd8785 100644 --- a/src/tools/cargo/src/bin/cargo/cli.rs +++ b/src/tools/cargo/src/bin/cargo/cli.rs -@@ -92,7 +92,12 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'" +@@ -135,7 +135,12 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'", } else if is_verbose { drop_println!(config, " {:<20} {}", name, path.display()); } else { diff --git a/clippy-driver-usage-should-user-friendly.patch b/clippy-driver-usage-should-user-friendly.patch index d618974f538286b42e3aeddec896cd95ee49771f..5787dfe4314fcd557f1dc081234e5318fc83c214 100644 --- a/clippy-driver-usage-should-user-friendly.patch +++ b/clippy-driver-usage-should-user-friendly.patch @@ -11,7 +11,7 @@ diff --git a/src/tools/clippy/src/driver.rs b/src/tools/clippy/src/driver.rs index f5f6c09e..7af74f15 100644 --- a/src/tools/clippy/src/driver.rs +++ b/src/tools/clippy/src/driver.rs -@@ -95,7 +95,7 @@ fn display_help() { +@@ -126,7 +126,7 @@ fn display_help() { Checks a package to catch common mistakes and improve your Rust code. Usage: diff --git a/fix-a-println-wrong-format.patch b/fix-a-println-wrong-format.patch index 478f4e5aaf209b02821bf8c886b26abd0e7da238..d9456bec8267d97928f4e2368e28d0159192528a 100644 --- a/fix-a-println-wrong-format.patch +++ b/fix-a-println-wrong-format.patch @@ -11,7 +11,7 @@ diff --git a/src/tools/cargo/src/bin/cargo/cli.rs b/src/tools/cargo/src/bin/carg index c2dd8785..9c240690 100644 --- a/src/tools/cargo/src/bin/cargo/cli.rs +++ b/src/tools/cargo/src/bin/cargo/cli.rs -@@ -94,7 +94,7 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'" +@@ -137,7 +137,7 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'", } else { if name.as_str() == "clippy" { let summary = "Checks a package to catch common mistakes and improve your Rust code."; diff --git a/omit-bootstrap-lib-deadcode-warning.patch b/omit-bootstrap-lib-deadcode-warning.patch new file mode 100644 index 0000000000000000000000000000000000000000..2d7e00c47eb5a25d88c29a1bd8d386ea2788821d --- /dev/null +++ b/omit-bootstrap-lib-deadcode-warning.patch @@ -0,0 +1,10 @@ +--- a/src/bootstrap/lib.rs ++++ a/src/bootstrap/lib.rs +@@ -273,6 +273,7 @@ + RefCell)>>>, + } + ++#[allow(dead_code)] + #[derive(Debug)] + struct Crate { + name: Interned, diff --git a/remove-field-is-never-read-warning.patch b/remove-field-is-never-read-warning.patch deleted file mode 100644 index c4f5731b30d9942f5b73e62978322bbffe763327..0000000000000000000000000000000000000000 --- a/remove-field-is-never-read-warning.patch +++ /dev/null @@ -1,59 +0,0 @@ -From aca8bcb48feca8c87b9af4e440835992d3f6d470 Mon Sep 17 00:00:00 2001 -From: Pietro Albini -Date: Tue, 19 Oct 2021 09:29:19 +0200 -Subject: [PATCH] remove "field is never read" warning - ---- - src/bootstrap/lib.rs | 1 - - src/bootstrap/metadata.rs | 3 +-- - src/tools/bump-stage0/src/main.rs | 1 - - 3 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 2d4e1527897..3b3c8a9227d 100644 ---- a/src/bootstrap/lib.rs -+++ b/src/bootstrap/lib.rs -@@ -277,7 +277,6 @@ pub struct Build { - struct Crate { - name: Interned, - deps: HashSet>, -- id: String, - path: PathBuf, - } - -diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs -index a38391c7b88..65e229697dc 100644 ---- a/src/bootstrap/metadata.rs -+++ b/src/bootstrap/metadata.rs -@@ -14,7 +14,6 @@ struct Output { - - #[derive(Deserialize)] - struct Package { -- id: String, - name: String, - source: Option, - manifest_path: String, -@@ -50,7 +49,7 @@ pub fn build(build: &mut Build) { - .filter(|dep| dep.source.is_none()) - .map(|dep| INTERNER.intern_string(dep.name)) - .collect(); -- build.crates.insert(name, Crate { name, id: package.id, deps, path }); -+ build.crates.insert(name, Crate { name, deps, path }); - } - } - } -diff --git a/src/tools/bump-stage0/src/main.rs b/src/tools/bump-stage0/src/main.rs -index 96d3c873843..d6364e28fef 100644 ---- a/src/tools/bump-stage0/src/main.rs -+++ b/src/tools/bump-stage0/src/main.rs -@@ -196,7 +196,6 @@ struct ManifestPackage { - - #[derive(Debug, serde::Deserialize)] - struct ManifestTargetPackage { -- available: bool, - url: Option, - hash: Option, - xz_url: Option, --- -2.30.0 - diff --git a/rust.spec b/rust.spec index 6d2ba00a7c387f79c2133a0b62963b42ebe4e53c..0c32e8651aa56fab3fc468dc1640a4ef7ab9caa5 100644 --- a/rust.spec +++ b/rust.spec @@ -1,9 +1,9 @@ %global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x %{!?channel: %global channel stable} -%global bootstrap_rust 1.56.0 -%global bootstrap_cargo 1.56.0 -%global bootstrap_channel 1.56.0 -%global bootstrap_date 2022-01-22 +%global bootstrap_rust 1.57.0 +%global bootstrap_cargo 1.57.0 +%global bootstrap_channel 1.57.0 +%global bootstrap_date 2022-02-27 %bcond_with llvm_static %bcond_with bundled_llvm %bcond_without bundled_libgit2 @@ -11,7 +11,7 @@ %bcond_without curl_http2 %bcond_without lldb Name: rust -Version: 1.57.0 +Version: 1.58.1 Release: 1 Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) @@ -24,12 +24,12 @@ ExclusiveArch: %{rust_arches} %endif Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.gz -Patch0000: rustc-1.56.0-disable-libssh2.patch -Patch0001: rustc-1.56.0-disable-http2.patch +Patch0000: rustc-1.58.1-disable-libssh2.patch +Patch0001: rustc-1.58.1-disable-http2.patch Patch0002: clippy-driver-usage-should-user-friendly.patch Patch0003: cargo-help-clippy-should-have-description-to-user.patch Patch0004: fix-a-println-wrong-format.patch -Patch0005: remove-field-is-never-read-warning.patch +Patch0005: omit-bootstrap-lib-deadcode-warning.patch %{lua: function rust_triple(arch) local abi = "gnu" if arch == "armv7hl" then @@ -96,8 +96,8 @@ BuildRequires: cmake >= 2.8.11 %global llvm llvm %global llvm_root %{_prefix} %endif -BuildRequires: %{llvm} >= 9.0 -BuildRequires: %{llvm}-devel >= 9.0 +BuildRequires: %{llvm} >= 12.0 +BuildRequires: %{llvm}-devel >= 12.0 %if %with llvm_static BuildRequires: %{llvm}-static libffi-devel %endif @@ -393,6 +393,7 @@ export %{rust_env} %{rustlibdir}/%{rust_musl_triple}/lib/*.rlib %{rustlibdir}/%{rust_musl_triple}/lib/self-contained/*.o %{rustlibdir}/%{rust_musl_triple}/lib/self-contained/libunwind.a +%{rustlibdir}/%{rust_musl_triple}/lib/self-contained/libc.a %files debugger-common %dir %{rustlibdir} @@ -466,6 +467,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Thu May 26 2022 fushanqing - 1.58.1-1 +- update to 1.58.1 + * Mon Feb 14 2022 chenchen - 1.57.0-1 - Update to 1.57.0 diff --git a/rustc-1.56.0-disable-http2.patch b/rustc-1.58.1-disable-http2.patch similarity index 77% rename from rustc-1.56.0-disable-http2.patch rename to rustc-1.58.1-disable-http2.patch index c2cc6ba4d4af21f73c55610c6b5c3fcb53562547..4f3c87342bee3f2c57985d47869f535ee8b51d6f 100644 --- a/rustc-1.56.0-disable-http2.patch +++ b/rustc-1.58.1-disable-http2.patch @@ -1,7 +1,7 @@ -From a27b88852f2e2f48d4a0434d2ef546d1ff29329c Mon Sep 17 00:00:00 2001 -From: sdlzx -Date: Fri, 17 Dec 2021 23:27:57 +0800 -Subject: disable http2 +From 39b90a6ca3134982d3eadf96ea2067cc7cfc6d8d Mon Sep 17 00:00:00 2001 +From: Liu Zixian +Date: Sat, 22 Jan 2022 00:37:26 +0800 +Subject: [PATCH] disable http2 --- Cargo.lock | 11 ----------- @@ -10,10 +10,10 @@ Subject: disable http2 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 26f68e235..926c2db74 100644 +index 2dbf34d87..908eb2c0b 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -877,7 +877,6 @@ checksum = "e0f44960aea24a786a46907b8824ebc0e66ca06bf4e4978408c7499620343483" +@@ -909,7 +909,6 @@ checksum = "d130987e6a6a34fe0889e1083022fa48cd90e6709a84be3fb8dd95801de5af20" dependencies = [ "cc", "libc", @@ -21,7 +21,7 @@ index 26f68e235..926c2db74 100644 "libz-sys", "openssl-sys", "pkg-config", -@@ -1906,16 +1905,6 @@ version = "0.1.4" +@@ -1926,16 +1925,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" @@ -39,23 +39,23 @@ index 26f68e235..926c2db74 100644 name = "libz-sys" version = "1.1.3" diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index ba5b956dd..eca593482 100644 +index e23f4ec06..4e615767e 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml -@@ -25,7 +25,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } +@@ -22,7 +22,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } cargo-util = { path = "crates/cargo-util", version = "0.1.1" } crates-io = { path = "crates/crates-io", version = "0.33.0" } crossbeam-utils = "0.8" --curl = { version = "0.4.39", features = ["http2"] } -+curl = { version = "0.4.39", features = [] } - curl-sys = "0.4.48" +-curl = { version = "0.4.41", features = ["http2"] } ++curl = { version = "0.4.41", features = [] } + curl-sys = "0.4.50" env_logger = "0.9.0" pretty_env_logger = { version = "0.4", optional = true } diff --git a/src/tools/cargo/src/cargo/core/package.rs b/src/tools/cargo/src/cargo/core/package.rs -index 6605a348e..92a01a89c 100644 +index dd73ea25c..e1ed94321 100644 --- a/src/tools/cargo/src/cargo/core/package.rs +++ b/src/tools/cargo/src/cargo/core/package.rs -@@ -417,14 +417,8 @@ impl<'cfg> PackageSet<'cfg> { +@@ -419,14 +419,8 @@ impl<'cfg> PackageSet<'cfg> { // Also note that pipelining is disabled as curl authors have indicated // that it's buggy, and we've empirically seen that it's buggy with HTTP // proxies. @@ -72,7 +72,7 @@ index 6605a348e..92a01a89c 100644 Ok(PackageSet { packages: package_ids -@@ -653,7 +647,7 @@ impl<'cfg> PackageSet<'cfg> { +@@ -655,7 +649,7 @@ impl<'cfg> PackageSet<'cfg> { macro_rules! try_old_curl { ($e:expr, $msg:expr) => { let result = $e; @@ -82,5 +82,5 @@ index 6605a348e..92a01a89c 100644 warn!("ignoring libcurl {} error: {}", $msg, e); } -- -2.33.1 +2.34.1 diff --git a/rustc-1.56.0-disable-libssh2.patch b/rustc-1.58.1-disable-libssh2.patch similarity index 71% rename from rustc-1.56.0-disable-libssh2.patch rename to rustc-1.58.1-disable-libssh2.patch index 656bc93674c6d7f77f9e12eb8b89c261f46b5f5b..fff1e49c4e175079dec6db36def92b6f24fe51df 100644 --- a/rustc-1.56.0-disable-libssh2.patch +++ b/rustc-1.58.1-disable-libssh2.patch @@ -1,7 +1,7 @@ -From 2e519b6b69557ce39444b39e34db6e660c710aa2 Mon Sep 17 00:00:00 2001 -From: sdlzx -Date: Fri, 17 Dec 2021 23:26:22 +0800 -Subject: disable libssh2 +From ea7aff0acb25c06a76dfc99f46543937750e910e Mon Sep 17 00:00:00 2001 +From: Liu Zixian +Date: Sat, 22 Jan 2022 00:36:17 +0800 +Subject: [PATCH] disable libssh2 --- Cargo.lock | 15 --------------- @@ -9,10 +9,10 @@ Subject: disable libssh2 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 4f1a5ca35..26f68e235 100644 +index 48d9fdb3d..2dbf34d87 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1895,7 +1895,6 @@ checksum = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885" +@@ -1915,7 +1915,6 @@ checksum = "ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c" dependencies = [ "cc", "libc", @@ -20,7 +20,7 @@ index 4f1a5ca35..26f68e235 100644 "libz-sys", "openssl-sys", "pkg-config", -@@ -1917,20 +1916,6 @@ dependencies = [ +@@ -1937,20 +1936,6 @@ dependencies = [ "libc", ] @@ -42,10 +42,10 @@ index 4f1a5ca35..26f68e235 100644 name = "libz-sys" version = "1.1.3" diff --git a/vendor/git2/Cargo.toml b/vendor/git2/Cargo.toml -index 4481d79c6..4e869c55f 100644 +index 299b77a8d..a05099544 100644 --- a/vendor/git2/Cargo.toml +++ b/vendor/git2/Cargo.toml -@@ -52,7 +52,7 @@ version = "3.3.0" +@@ -51,7 +51,7 @@ version = "3.3.0" version = "0.1.39" [features] @@ -55,5 +55,5 @@ index 4481d79c6..4e869c55f 100644 ssh = ["libgit2-sys/ssh"] ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"] -- -2.33.1 +2.34.1 diff --git a/rustc-1.57.0-src.tar.gz b/rustc-1.58.1-src.tar.gz similarity index 88% rename from rustc-1.57.0-src.tar.gz rename to rustc-1.58.1-src.tar.gz index 7fda94737802c048ea7d838b03971d367f727b7d..26ffe003f764fafdeaae115239204713846f9703 100644 Binary files a/rustc-1.57.0-src.tar.gz and b/rustc-1.58.1-src.tar.gz differ