Skip to content

Commit 2734d7e

Browse files
uklotzdeSerial-ATA
authored andcommitted
Upgrade to Rust 1.85 / Edition 2024
1 parent 756f543 commit 2734d7e

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

Cargo.toml

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[workspace]
2-
# TODO: Switch to MSRV-aware resolver version "3" (Rust 1.84)
3-
resolver = "2"
2+
resolver = "3"
43

54
members = [
65
"lofty",
@@ -11,8 +10,8 @@ members = [
1110
]
1211

1312
[workspace.package]
14-
edition = "2021"
15-
rust-version = "1.82"
13+
edition = "2024"
14+
rust-version = "1.85"
1615
repository = "https://github.com/Serial-ATA/lofty-rs"
1716
license = "MIT OR Apache-2.0"
1817

@@ -34,14 +33,6 @@ unused_import_braces = "deny"
3433
explicit_outlives_requirements = "deny"
3534
unknown_lints = "allow"
3635

37-
# Opt-in to new drop order of Edition 2024.
38-
# TODO: Remove if no longer needed.
39-
tail_expr_drop_order = "allow"
40-
if_let_rescope = "allow"
41-
42-
# TODO: Remove after switching to Edition 2024.
43-
edition_2024_expr_fragment_specifier = "allow"
44-
4536
[workspace.lints.clippy]
4637
dbg_macro = "forbid"
4738
string_to_string = "forbid"

rustfmt.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
edition = "2021"
1+
edition = "2024"
22
unstable_features = true
33
condense_wildcard_suffixes = true
44
format_code_in_doc_comments = true

0 commit comments

Comments
 (0)