diff options
| author | extrawurst <mail@rusticorn.com> | 2023-01-28 14:52:54 +0100 |
|---|---|---|
| committer | extrawurst <776816+extrawurst@users.noreply.github.com> | 2023-01-29 09:28:09 +0100 |
| commit | ce70d5ef12ae5e4df2953385f2c4e1293400ae2e (patch) | |
| tree | 661e5e0f4512b663528d22096cdbdae40b31d01c | |
| parent | 48eed0562a9416555105f2802e987ab0711cedbb (diff) | |
bump msrv 1.64
| -rw-r--r-- | .clippy.toml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/components/syntax_text.rs | 9 |
5 files changed, 11 insertions, 10 deletions
diff --git a/.clippy.toml b/.clippy.toml index 2723a280..bdfdfde5 100644 --- a/.clippy.toml +++ b/.clippy.toml @@ -1,2 +1,2 @@ -msrv = "1.60.0" +msrv = "1.64.0" cognitive-complexity-threshold = 18
\ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bddddf5..04621089 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [nightly, stable, '1.60'] + rust: [nightly, stable, '1.64'] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} @@ -91,7 +91,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, '1.60'] + rust: [nightly, stable, '1.64'] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@master @@ -125,7 +125,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, '1.60'] + rust: [nightly, stable, '1.64'] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@master @@ -4,7 +4,7 @@ version = "0.22.1" authors = ["extrawurst <mail@rusticorn.com>"] description = "blazing fast terminal-ui for git" edition = "2021" -rust-version = "1.60" +rust-version = "1.64" exclude = [".github/*", ".vscode/*", "assets/*"] homepage = "https://github.com/extrawurst/gitui" repository = "https://github.com/extrawurst/gitui" @@ -179,7 +179,7 @@ Binaries available for: ### Requirements -- Minimum supported `rust`/`cargo` version: `1.60` +- Minimum supported `rust`/`cargo` version: `1.64` - See [Install Rust](https://www.rust-lang.org/tools/install) ### Cargo Install diff --git a/src/components/syntax_text.rs b/src/components/syntax_text.rs index 4b20a89f..d9599176 100644 --- a/src/components/syntax_text.rs +++ b/src/components/syntax_text.rs @@ -271,10 +271,11 @@ impl Component for SyntaxTextComponent { ) -> Result<EventState> { if let Event::Key(key) = event { if let Some(nav) = common_nav(key, &self.key_config) { - return Ok(self - .scroll(nav) - .then(|| EventState::Consumed) - .unwrap_or(EventState::NotConsumed)); + return Ok(if self.scroll(nav) { + EventState::Consumed + } else { + EventState::NotConsumed + }); } } |