!68 Update to 1.59.0

From: @sdlzx 
Reviewed-by: @jingxiaolu 
Signed-off-by: @jingxiaolu
This commit is contained in:
openeuler-ci-bot 2022-04-18 01:48:38 +00:00 committed by Gitee
commit 96fed9c9a8
2 changed files with 8 additions and 17 deletions

View File

@ -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>,

View File

@ -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