bump msrv to 1.65

extrawurst · May 14, 2023 · d6f3353 · d6f3353
1 parent 8fa96fd
commit d6f3353
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.clippy.toml b/.clippy.toml
@@ -1,2 +1,2 @@
-msrv = "1.64.0"
+msrv = "1.65.0"
 cognitive-complexity-threshold = 18
diff --git 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.64']
+        rust: [nightly, stable, '1.65']
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.rust == 'nightly' }}
 
@@ -94,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, stable, '1.64']
+        rust: [nightly, stable, '1.65']
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
     - uses: actions/checkout@master
@@ -130,7 +130,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, stable, '1.64']
+        rust: [nightly, stable, '1.65']
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
     - uses: actions/checkout@master

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ![fuzzy-branch](assets/fuzzy-find-branch.gif)
 
+### Changed
+* minimum supported rust version bumped to 1.65 (thank you `time`)
+
 ### Breaking Change
 * `focus_XYZ` key bindings are merged into the `move_XYZ` set, so only one way to bind arrow-like keys from now on ([#1539](https://github.com/extrawurst/gitui/issues/1539))
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -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.64"
+rust-version = "1.65"
 exclude = [".github/*", ".vscode/*", "assets/*"]
 homepage = "https://github.com/extrawurst/gitui"
 repository = "https://github.com/extrawurst/gitui"

diff --git a/asyncgit/src/sync/config.rs b/asyncgit/src/sync/config.rs
@@ -71,6 +71,7 @@ pub fn untracked_files_config(
 }
 
 /// get string from config
+
 pub fn get_config_string(
 	repo_path: &RepoPath,
 	key: &str,
@@ -91,10 +92,7 @@ pub fn get_config_string_repo(
 	// gets returned when but it actually works
 	let entry_res = cfg.get_entry(key);
 
-	let entry = match entry_res {
-		Ok(ent) => ent,
-		Err(_) => return Ok(None),
-	};
+	let Ok(entry) = entry_res else { return Ok(None) };
 
 	if entry.has_value() {
 		Ok(entry.value().map(std::string::ToString::to_string))