bump msrv 1.64

.clippy.toml

@@ -1,2 +1,2 @@
-msrv = "1.60.0"
+msrv = "1.64.0"
 cognitive-complexity-threshold = 18

.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

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.22.1"
 authors = ["extrawurst <[email protected]>"]
 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"

README.md

@@ -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

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
+				});
 			}
 		}