Skip to content

Commit

Permalink
Update minimum supported Rust version to 1.47.0
Browse files Browse the repository at this point in the history
This change updates the minimum supported version of Rust to 1.47.0.
This toolchain version is required by nitrokey-sys 3.7.0, which we want
to pull in with subsequent changes in order to get an endless loop
fixed.
  • Loading branch information
d-e-s-o committed Apr 30, 2022
1 parent f44033a commit 4433fe6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [1.46.0, stable, beta, nightly]
rust: [1.47.0, stable, beta, nightly]
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand All @@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.46.0
toolchain: 1.47.0
components: clippy
override: true
- run: cargo clippy --workspace --all-targets --all-features --verbose -- -A unknown_lints -D warnings
Expand All @@ -62,7 +62,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.46.0
toolchain: 1.47.0
components: rustfmt
override: true
- run: cargo fmt --all -- --check
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Unreleased
----------
- Introduced `otp-cache` core extension
- Included `git` tag/revision in `-V`/`--version` output
- Updated minimum supported Rust version to `1.46.0`
- Updated minimum supported Rust version to `1.47.0`
- Bumped `anyhow` dependency to `1.0.57`
- Bumped `directories` dependency to `4.0.1`
- Bumped `libc` dependency to `0.2.125`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![pipeline](https://github.com/d-e-s-o/nitrocli/actions/workflows/.github/workflows/ci.yml/badge.svg)](https://github.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.46+-blue.svg)](https://blog.rust-lang.org/2020/08/27/Rust-1.46.0.html)
[![rustc](https://img.shields.io/badge/rustc-1.47+-blue.svg)](https://blog.rust-lang.org/2020/10/08/Rust-1.47.html)

nitrocli
========
Expand Down
16 changes: 8 additions & 8 deletions var/shell-complete.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// shell-complete.rs

// Copyright (C) 2020-2021 The Nitrocli Developers
// Copyright (C) 2020-2022 The Nitrocli Developers
// SPDX-License-Identifier: GPL-3.0-or-later

use std::io;
Expand Down Expand Up @@ -80,13 +80,13 @@ mod tests {

/// Check if `bash` is present on the system.
fn has_bash() -> bool {
match process::Command::new("bash").arg("-c").arg("exit").spawn() {
// We deliberately only indicate that bash does not exist if we
// get a file-not-found error. We don't expect any other error but
// should there be one things will blow up later.
Err(ref err) if err.kind() == io::ErrorKind::NotFound => false,
_ => true,
}
// We deliberately only indicate that bash does not exist if we
// get a file-not-found error. We don't expect any other error but
// should there be one things will blow up later.
!matches!(
process::Command::new("bash").arg("-c").arg("exit").spawn(),
Err(ref err) if err.kind() == io::ErrorKind::NotFound
)
}

/// Perform a bash completion of the given arguments to nitrocli.
Expand Down

0 comments on commit 4433fe6

Please sign in to comment.