From 8888511dbd6ad74e451af1d9a09c3a8fd7924062 Mon Sep 17 00:00:00 2001
From: Liu Zixian <liuzixian4@huawei.com>
Date: Tue, 15 Mar 2022 07:53:20 +0800
Subject: [PATCH] Update to 1.59.0

---
 omit-bootstrap-lib-deadcode-warning.patch | 10 ----------
 rust.spec                                 | 15 ++++++++-------
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 omit-bootstrap-lib-deadcode-warning.patch

diff --git a/omit-bootstrap-lib-deadcode-warning.patch b/omit-bootstrap-lib-deadcode-warning.patch
deleted file mode 100644
index 2d7e00c..0000000
--- a/omit-bootstrap-lib-deadcode-warning.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/bootstrap/lib.rs
-+++ a/src/bootstrap/lib.rs
-@@ -273,6 +273,7 @@
-         RefCell<HashMap<TargetSelection, HashMap<String, (&'static str, PathBuf, Vec<String>)>>>,
- }
- 
-+#[allow(dead_code)]
- #[derive(Debug)]
- struct Crate {
-     name: Interned<String>,
diff --git a/rust.spec b/rust.spec
index 9e0bc93..fb3f4dd 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.57.0
-%global bootstrap_cargo 1.57.0
-%global bootstrap_channel 1.57.0
-%global bootstrap_date 2022-02-27
+%global bootstrap_rust 1.58.1
+%global bootstrap_cargo 1.58.1
+%global bootstrap_channel 1.58.1
+%global bootstrap_date 2022-02-28
 %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.58.1
+Version:             1.59.0
 Release:             1
 Summary:             The Rust Programming Language
 License:             (ASL 2.0 or MIT) and (BSD and MIT)
@@ -29,7 +29,6 @@ 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:           omit-bootstrap-lib-deadcode-warning.patch
 %{lua: function rust_triple(arch)
   local abi = "gnu"
   if arch == "armv7hl" then
@@ -250,7 +249,6 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
-%patch0005 -p1
 rm -rf vendor/curl-sys/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
 rm -rf vendor/libssh2-sys/libssh2/
@@ -467,6 +465,9 @@ export %{rust_env}
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Mon Feb 28 2022 Liu Zixian <liuzixian4@huawei.com> - 1.59.0-1
+- Update to 1.59.0
+
 * Sun Feb 27 2022 Liu Zixian <liuzixian4@huawei.com> - 1.58.1-1
 - Update to 1.58.1