-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update minimum required Rust version to 1.35.0
This change updates the minimum required version of Rust to 1.35.0. The motivation for doing so is at least two fold. First, next we want to bump the nitrokey crate to version 0.4.0 and it requires Rust 1.34.0 as a minimum. Second, and perhaps more importantly, though, in 1.34.0 a clippy lint regressed, breaking our pipeline. That is the reason why we are going to 1.35.0 instead.
- Loading branch information
Showing
5 changed files
with
10 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
// commands.rs | ||
|
||
// ************************************************************************* | ||
// * Copyright (C) 2018-2019 Daniel Mueller ([email protected]) * | ||
// * Copyright (C) 2018-2020 Daniel Mueller ([email protected]) * | ||
// * * | ||
// * This program is free software: you can redistribute it and/or modify * | ||
// * it under the terms of the GNU General Public License as published by * | ||
|
@@ -949,11 +949,7 @@ pub fn pws_status(ctx: &mut args::ExecCtx<'_>, all: bool) -> Result<()> { | |
.get_slot_status() | ||
.map_err(|err| get_error("Could not read PWS slot status", err))?; | ||
println!(ctx, "slot\tname")?; | ||
for (i, &value) in slots | ||
.into_iter() | ||
.enumerate() | ||
.filter(|(_, &value)| all || value) | ||
{ | ||
for (i, &value) in slots.iter().enumerate().filter(|(_, &value)| all || value) { | ||
print_pws_slot(ctx, &pws, i, value)?; | ||
} | ||
Ok(()) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
// pinentry.rs | ||
|
||
// ************************************************************************* | ||
// * Copyright (C) 2017-2019 Daniel Mueller ([email protected]) * | ||
// * Copyright (C) 2017-2020 Daniel Mueller ([email protected]) * | ||
// * * | ||
// * This program is free software: you can redistribute it and/or modify * | ||
// * it under the terms of the GNU General Public License as published by * | ||
|
@@ -357,7 +357,7 @@ mod tests { | |
let response = "ERR ".to_string() + error + "\n"; | ||
let expected = error; | ||
|
||
let error = parse_pinentry_pin(response.to_string()); | ||
let error = parse_pinentry_pin(response); | ||
|
||
if let Error::Error(ref e) = error.err().unwrap() { | ||
assert_eq!(e, &expected); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
// mod.rs | ||
|
||
// ************************************************************************* | ||
// * Copyright (C) 2019 Daniel Mueller ([email protected]) * | ||
// * Copyright (C) 2019-2020 Daniel Mueller ([email protected]) * | ||
// * * | ||
// * This program is free software: you can redistribute it and/or modify * | ||
// * it under the terms of the GNU General Public License as published by * | ||
|
@@ -139,10 +139,10 @@ impl Nitrocli { | |
F: FnOnce(&mut crate::RunCtx<'_>, Vec<String>) -> R, | ||
{ | ||
let args = ["nitrocli"] | ||
.into_iter() | ||
.iter() | ||
.cloned() | ||
.chain(self.model.map(Self::model_to_arg)) | ||
.chain(args.into_iter().cloned()) | ||
.chain(args.iter().cloned()) | ||
.map(ToOwned::to_owned) | ||
.collect(); | ||
|
||
|