Skip to content

bump msrv to 1.65 #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2023
Merged

bump msrv to 1.65 #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clippy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
msrv = "1.64.0"
msrv = "1.65.0"
cognitive-complexity-threshold = 18
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.22.1"
authors = ["extrawurst <[email protected]>"]
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"
Expand Down
6 changes: 2 additions & 4 deletions asyncgit/src/sync/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ pub fn untracked_files_config(
}

/// get string from config
pub fn get_config_string(
repo_path: &RepoPath,
key: &str,
Expand All @@ -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))
Expand Down