Skip to content

Commit d6f3353

Browse files
pm100extrawurst
authored andcommitted
bump msrv to 1.65
1 parent 8fa96fd commit d6f3353

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.clippy.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
msrv = "1.64.0"
1+
msrv = "1.65.0"
22
cognitive-complexity-threshold = 18

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os: [ubuntu-latest, macos-latest, windows-latest]
20-
rust: [nightly, stable, '1.64']
20+
rust: [nightly, stable, '1.65']
2121
runs-on: ${{ matrix.os }}
2222
continue-on-error: ${{ matrix.rust == 'nightly' }}
2323

@@ -94,7 +94,7 @@ jobs:
9494
strategy:
9595
fail-fast: false
9696
matrix:
97-
rust: [nightly, stable, '1.64']
97+
rust: [nightly, stable, '1.65']
9898
continue-on-error: ${{ matrix.rust == 'nightly' }}
9999
steps:
100100
- uses: actions/checkout@master
@@ -130,7 +130,7 @@ jobs:
130130
strategy:
131131
fail-fast: false
132132
matrix:
133-
rust: [nightly, stable, '1.64']
133+
rust: [nightly, stable, '1.65']
134134
continue-on-error: ${{ matrix.rust == 'nightly' }}
135135
steps:
136136
- uses: actions/checkout@master

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1919

2020
![fuzzy-branch](assets/fuzzy-find-branch.gif)
2121

22+
### Changed
23+
* minimum supported rust version bumped to 1.65 (thank you `time`)
24+
2225
### Breaking Change
2326
* `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))
2427

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.22.1"
44
authors = ["extrawurst <[email protected]>"]
55
description = "blazing fast terminal-ui for git"
66
edition = "2021"
7-
rust-version = "1.64"
7+
rust-version = "1.65"
88
exclude = [".github/*", ".vscode/*", "assets/*"]
99
homepage = "https://github.com/extrawurst/gitui"
1010
repository = "https://github.com/extrawurst/gitui"

asyncgit/src/sync/config.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ pub fn untracked_files_config(
7171
}
7272

7373
/// get string from config
74+
7475
pub fn get_config_string(
7576
repo_path: &RepoPath,
7677
key: &str,
@@ -91,10 +92,7 @@ pub fn get_config_string_repo(
9192
// gets returned when but it actually works
9293
let entry_res = cfg.get_entry(key);
9394

94-
let entry = match entry_res {
95-
Ok(ent) => ent,
96-
Err(_) => return Ok(None),
97-
};
95+
let Ok(entry) = entry_res else { return Ok(None) };
9896

9997
if entry.has_value() {
10098
Ok(entry.value().map(std::string::ToString::to_string))

0 commit comments

Comments
 (0)