You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.1 KiB
39 lines
1.1 KiB
5 years ago
|
From e8589e45b63f65b18d0086dad03eda35a33ec150 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Josh Stone <jistone@redhat.com>
|
||
|
|
Date: Thu, 23 Apr 2020 11:20:56 -0700
|
||
|
|
Subject: [PATCH] Upgrade to cargo 0.44
|
||
|
|
|
||
|
|
---
|
||
|
|
src/build.rs | 13 ++++++-------
|
||
|
|
1 file changed, 6 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/build.rs b/src/build.rs
|
||
|
|
index 2ea9a9aaf863..7610d598b606 100644
|
||
|
|
--- a/src/build.rs
|
||
|
|
+++ b/src/build.rs
|
||
|
|
@@ -263,15 +263,14 @@ pub fn cbuild(
|
||
|
|
|
||
|
|
pub fn config_configure(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
|
||
|
|
let arg_target_dir = &args.value_of_path("target-dir", config);
|
||
|
|
- let config_args: Vec<&str> = args.values_of("config").unwrap_or_default().collect();
|
||
|
|
- let quiet = if args.is_present("quiet") {
|
||
|
|
- Some(true)
|
||
|
|
- } else {
|
||
|
|
- None
|
||
|
|
- };
|
||
|
|
+ let config_args: Vec<_> = args
|
||
|
|
+ .values_of("config")
|
||
|
|
+ .unwrap_or_default()
|
||
|
|
+ .map(String::from)
|
||
|
|
+ .collect();
|
||
|
|
config.configure(
|
||
|
|
args.occurrences_of("verbose") as u32,
|
||
|
|
- quiet,
|
||
|
|
+ args.is_present("quiet"),
|
||
|
|
args.value_of("color"),
|
||
|
|
args.is_present("frozen"),
|
||
|
|
args.is_present("locked"),
|
||
|
|
--
|
||
|
|
2.25.3
|
||
|
|
|