From e6e2da39be57e3106dee433e8557180b4f46a8f1 Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Mon, 30 Aug 2021 14:54:13 +0800
Subject: [PATCH] Fix rustdoc error info

(cherry picked from commit 7c171bdad3a9c03f1f0f94724b692fd3e56d8871)
---
 fix-rustdoc-error-info.patch | 39 ++++++++++++++++++++++++++++++++++++
 rust.spec                    |  7 ++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 fix-rustdoc-error-info.patch

diff --git a/fix-rustdoc-error-info.patch b/fix-rustdoc-error-info.patch
new file mode 100644
index 0000000..49b72c9
--- /dev/null
+++ b/fix-rustdoc-error-info.patch
@@ -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
+
diff --git a/rust.spec b/rust.spec
index 1934afe..39266d2 100644
--- a/rust.spec
+++ b/rust.spec
@@ -12,7 +12,7 @@
 %bcond_without lldb
 Name:                rust
 Version:             1.51.0
-Release:             5
+Release:             6
 Summary:             The Rust Programming Language
 License:             (ASL 2.0 or MIT) and (BSD and MIT)
 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
 Patch0012:           fix-a-println-wrong-format.patch
 Patch0013:           CVE-2021-29922.patch
+Patch0014:           fix-rustdoc-error-info.patch
 %{lua: function rust_triple(arch)
   local abi = "gnu"
   if arch == "armv7hl" then
@@ -262,6 +263,7 @@ mkdir -p src/llvm-project/libunwind/
 %patch0011 -p1
 %patch0012 -p1
 %patch0013 -p1
+%patch0014 -p1
 rm -rf vendor/curl-sys/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
 rm -rf vendor/libssh2-sys/libssh2/
@@ -467,6 +469,9 @@ export %{rust_env}
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Tue Aug 24 2021 caodongxia <caodongxia@huawei.com> - 1.51.0-6
+- Fix rustdoc error info
+
 * Wed 18 Aug 2021 yaoxin <yaoxin30@huawei.com> - 1.51.0-5
 - fix CVE-2021-29922
 
-- 
Gitee