Skip to content

Commit 569c186

Browse files
committed
Update MSRV to 1.75 for access to impl returns in traits.
Helix can follow.
1 parent fe2a58c commit 569c186

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

.github/workflows/msrv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
env:
3232
# dictated by `firefox` to support the `helix` editor, but now probably effectively be controlled by `jiff`, which also aligns with `regex`.
3333
# IMPORTANT: adjust etc/msrv-badge.svg as well
34-
rust_version: 1.74.0
34+
rust_version: 1.75.0
3535

3636
steps:
3737
- uses: actions/checkout@v4

etc/msrv-badge.svg

Lines changed: 3 additions & 3 deletions
Loading

gix-fs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
88
description = "A crate providing file system specific utilities to `gitoxide`"
99
authors = ["Sebastian Thiel <[email protected]>"]
1010
edition = "2021"
11-
rust-version = "1.74"
11+
rust-version = "1.75"
1212
include = ["src/**/*", "LICENSE-*"]
1313

1414
[lib]

gix-fs/src/stack.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,17 @@ pub mod to_normal_path_components {
1919
/// Obtain an iterator over `OsStr`-components which are normal, none-relative and not absolute.
2020
pub trait ToNormalPathComponents {
2121
/// Return an iterator over the normal components of a path, without the separator.
22-
// TODO(MSRV): turn this into `impl Iterator` once MSRV is 1.75 or higher
23-
fn to_normal_path_components(
24-
&self,
25-
) -> Box<dyn Iterator<Item = Result<&OsStr, to_normal_path_components::Error>> + '_>;
22+
fn to_normal_path_components(&self) -> impl Iterator<Item = Result<&OsStr, to_normal_path_components::Error>>;
2623
}
2724

2825
impl ToNormalPathComponents for &Path {
29-
fn to_normal_path_components(
30-
&self,
31-
) -> Box<dyn Iterator<Item = Result<&OsStr, to_normal_path_components::Error>> + '_> {
32-
Box::new(self.components().map(|component| match component {
26+
fn to_normal_path_components(&self) -> impl Iterator<Item = Result<&OsStr, to_normal_path_components::Error>> {
27+
self.components().map(|component| match component {
3328
Component::Normal(os_str) => Ok(os_str),
3429
_ => Err(to_normal_path_components::Error::NotANormalComponent(
3530
self.as_os_str().to_owned(),
3631
)),
37-
}))
32+
})
3833
}
3934
}
4035

gix/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = "0.70.0"
99
authors = ["Sebastian Thiel <[email protected]>"]
1010
edition = "2021"
1111
include = ["src/**/*", "LICENSE-*"]
12-
rust-version = "1.70"
12+
rust-version = "1.75"
1313

1414
[lib]
1515
doctest = false

0 commit comments

Comments
 (0)