Fix rustdoc error info
(cherry picked from commit 796770592f02c10f78b63eecedabeaafd92e5447)
This commit is contained in:
parent
992d63f306
commit
ece3cd2b85
39
fix-rustdoc-error-info.patch
Normal file
39
fix-rustdoc-error-info.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From c2b79c6142da1a757f9b4a0b58883e39aade779c Mon Sep 17 00:00:00 2001
|
||||||
|
From: caodongxia <315816521@qq.com>
|
||||||
|
Date: Tue, 24 Aug 2021 09:11:28 +0800
|
||||||
|
Subject: [PATCH] fix rustdoc error info
|
||||||
|
|
||||||
|
---
|
||||||
|
compiler/rustc_session/src/config.rs | 2 +-
|
||||||
|
vendor/rustc-ap-rustc_session/src/config.rs | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
|
||||||
|
index a6d4dcb34..ab8ef7a3c 100644
|
||||||
|
--- a/compiler/rustc_session/src/config.rs
|
||||||
|
+++ b/compiler/rustc_session/src/config.rs
|
||||||
|
@@ -891,7 +891,7 @@ pub fn build_target_config(opts: &Options, target_override: Option<Target>) -> T
|
||||||
|
opts.error_format,
|
||||||
|
&format!(
|
||||||
|
"Error loading target specification: {}. \
|
||||||
|
- Use `--print target-list` for a list of built-in targets",
|
||||||
|
+ Use `rustc --print target-list` for a list of built-in targets",
|
||||||
|
e
|
||||||
|
),
|
||||||
|
)
|
||||||
|
diff --git a/vendor/rustc-ap-rustc_session/src/config.rs b/vendor/rustc-ap-rustc_session/src/config.rs
|
||||||
|
index 9d73c3b44..223e4eead 100644
|
||||||
|
--- a/vendor/rustc-ap-rustc_session/src/config.rs
|
||||||
|
+++ b/vendor/rustc-ap-rustc_session/src/config.rs
|
||||||
|
@@ -891,7 +891,7 @@ pub fn build_target_config(opts: &Options, target_override: Option<Target>) -> T
|
||||||
|
opts.error_format,
|
||||||
|
&format!(
|
||||||
|
"Error loading target specification: {}. \
|
||||||
|
- Use `--print target-list` for a list of built-in targets",
|
||||||
|
+ Use `rustc --print target-list` for a list of built-in targets",
|
||||||
|
e
|
||||||
|
),
|
||||||
|
)
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -12,7 +12,7 @@
|
|||||||
%bcond_without lldb
|
%bcond_without lldb
|
||||||
Name: rust
|
Name: rust
|
||||||
Version: 1.51.0
|
Version: 1.51.0
|
||||||
Release: 8
|
Release: 9
|
||||||
Summary: The Rust Programming Language
|
Summary: The Rust Programming Language
|
||||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||||
URL: https://www.rust-lang.org
|
URL: https://www.rust-lang.org
|
||||||
@ -39,6 +39,7 @@ Patch0010: clippy-driver-usage-should-user-friendly.patch
|
|||||||
Patch0011: cargo-help-clippy-should-have-description-to-user.patch
|
Patch0011: cargo-help-clippy-should-have-description-to-user.patch
|
||||||
Patch0012: fix-a-println-wrong-format.patch
|
Patch0012: fix-a-println-wrong-format.patch
|
||||||
Patch0013: CVE-2021-29922.patch
|
Patch0013: CVE-2021-29922.patch
|
||||||
|
Patch0014: fix-rustdoc-error-info.patch
|
||||||
%{lua: function rust_triple(arch)
|
%{lua: function rust_triple(arch)
|
||||||
local abi = "gnu"
|
local abi = "gnu"
|
||||||
if arch == "armv7hl" then
|
if arch == "armv7hl" then
|
||||||
@ -271,6 +272,7 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
|
|||||||
%patch0011 -p1
|
%patch0011 -p1
|
||||||
%patch0012 -p1
|
%patch0012 -p1
|
||||||
%patch0013 -p1
|
%patch0013 -p1
|
||||||
|
%patch0014 -p1
|
||||||
rm -rf vendor/curl-sys/curl/
|
rm -rf vendor/curl-sys/curl/
|
||||||
rm -rf vendor/jemalloc-sys/jemalloc/
|
rm -rf vendor/jemalloc-sys/jemalloc/
|
||||||
rm -rf vendor/libssh2-sys/libssh2/
|
rm -rf vendor/libssh2-sys/libssh2/
|
||||||
@ -484,6 +486,9 @@ export %{rust_env}
|
|||||||
%{_mandir}/man1/cargo*.1*
|
%{_mandir}/man1/cargo*.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 24 2021 caodongxia <caodongxia@huawei.com> - 1.51.0-9
|
||||||
|
- Fix rustdoc error info
|
||||||
|
|
||||||
* Wed Aug 18 2021 yaoxin <yaoxin30@huawei.com> - 1.51.0-8
|
* Wed Aug 18 2021 yaoxin <yaoxin30@huawei.com> - 1.51.0-8
|
||||||
- Fix CVE-2021-29922
|
- Fix CVE-2021-29922
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user