Skip to content

Commit

Permalink
Update minimum required Rust version to 1.35.0
Browse files Browse the repository at this point in the history
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
d-e-s-o committed Dec 31, 2019
1 parent 476cbd7 commit 63d4197
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion nitrocli/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![pipeline](https://gitlab.com/d-e-s-o/nitrocli/badges/master/pipeline.svg)](https://gitlab.com/d-e-s-o/nitrocli/commits/master)
[![crates.io](https://img.shields.io/crates/v/nitrocli.svg)](https://crates.io/crates/nitrocli)
[![rustc](https://img.shields.io/badge/rustc-1.31+-blue.svg)](https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html)
[![rustc](https://img.shields.io/badge/rustc-1.35+-blue.svg)](https://blog.rust-lang.org/2019/05/23/Rust-1.35.0.html)

nitrocli
========
Expand Down
4 changes: 2 additions & 2 deletions nitrocli/ci/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/rust/tags/
# The recipe for this docker image can be found at:
# https://github.com/rust-lang/docker-rust/blob/e7703b2cf525f2525bdf8d131cd66b5b38b1513c/1.31.0/stretch/Dockerfile
image: "rust:1.31.0"
# https://github.com/rust-lang/docker-rust/blob/29bf41a2cc4fb8d3f588cf51eb6a8ba883808c4b/1.35.0/stretch/Dockerfile
image: "rust:1.35.0"

build-test:cargo:
script:
Expand Down
8 changes: 2 additions & 6 deletions nitrocli/src/commands.rs
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 *
Expand Down Expand Up @@ -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(())
Expand Down
4 changes: 2 additions & 2 deletions nitrocli/src/pinentry.rs
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 *
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions nitrocli/src/tests/mod.rs
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 *
Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit 63d4197

Please sign in to comment.