From 68aa9b1043583cc66c565df4384134fcbdc4f865 Mon Sep 17 00:00:00 2001 From: si-gui Date: Thu, 24 Jun 2021 20:22:37 +0800 Subject: [PATCH] fix a println wrong format --- fix-a-println-wrong-format.patch | 25 +++++++++++++++++++++++++ rust.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 fix-a-println-wrong-format.patch diff --git a/fix-a-println-wrong-format.patch b/fix-a-println-wrong-format.patch new file mode 100644 index 0000000..478f4e5 --- /dev/null +++ b/fix-a-println-wrong-format.patch @@ -0,0 +1,25 @@ +From edbb1b7011fe7bccf8a2efc71d806d61cd8e0c9b Mon Sep 17 00:00:00 2001 +From: si-gui +Date: Thu, 24 Jun 2021 20:15:14 +0800 +Subject: [PATCH] fix a println wrong format + +--- + src/tools/cargo/src/bin/cargo/cli.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/cargo/src/bin/cargo/cli.rs b/src/tools/cargo/src/bin/cargo/cli.rs +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]'" + } else { + if name.as_str() == "clippy" { + let summary = "Checks a package to catch common mistakes and improve your Rust code."; +- drop_println!(config, " {}", name, summary); ++ drop_println!(config, " {:<20} {}", name, summary); + } else { + drop_println!(config, " {}", name); + } +-- +2.30.0 + diff --git a/rust.spec b/rust.spec index d3073a0..6f8982d 100644 --- a/rust.spec +++ b/rust.spec @@ -12,7 +12,7 @@ %bcond_without lldb Name: rust Version: 1.51.0 -Release: 3 +Release: 4 Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) URL: https://www.rust-lang.org @@ -37,6 +37,7 @@ Patch0008: rustc-1.48.0-disable-libssh2.patch Patch0009: rustc-1.51.0-disable-http2.patch 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 %{lua: function rust_triple(arch) local abi = "gnu" if arch == "armv7hl" then @@ -258,6 +259,7 @@ mkdir -p src/llvm-project/libunwind/ %endif %patch0010 -p1 %patch0011 -p1 +%patch0012 -p1 rm -rf vendor/curl-sys/curl/ rm -rf vendor/jemalloc-sys/jemalloc/ rm -rf vendor/libssh2-sys/libssh2/ @@ -463,6 +465,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Thu 24 Jun 2021 sunguoshuai - 1.51.0-4 +- fix a println wrong format + * Thu 24 Jun 2021 sunguoshuai - 1.51.0-3 - cargo help clippy should have description to user -- Gitee