Skip to content

Commit 32f269d

Browse files
committed
cargo update & lint/clippy/rustfmt fixes.
1 parent 39140c7 commit 32f269d

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.github/workflows/ci.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ jobs:
1818
submodules: true
1919
- uses: actions-rs/toolchain@v1
2020
with:
21-
# HACK(eddyb) only nightly supports setting `version = "Two"`
22-
# in `rustfmt.toml`, which is needed to format array/slice patterns
23-
# at all (see https://github.com/rust-lang/rustfmt/pull/4994).
21+
# FIXME(eddyb) `style_edition = "2024"` in `rustfmt.toml` is what keeps
22+
# this on `nightly`, should switch to `stable` when that stabilizes.
2423
toolchain: nightly
2524
override: true
2625

Cargo.lock

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ serde = { version = "1.0", features = ["derive"] }
3434
serde_json = "1.0"
3535
smallvec = { version = "1.7.0", features = ["serde", "union"] }
3636

37+
[lints.rust]
38+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(git_main_docs)'] }
39+
3740
[package.metadata.docs.rs]
3841
all-features = true
3942
rustdoc-args = ["--cfg", "docsrs", "--document-private-items"]

rustfmt.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# HACK(eddyb) needed to format array/slice patterns at all, because it was a
2-
# breaking change (see https://github.com/rust-lang/rustfmt/pull/4994).
3-
version = "Two"
1+
style_edition = "2024"
42

53
# HACK(eddyb) avoid random spilling of e.g. method call chains onto many lines.
64
use_small_heuristics = "Max"

src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
clippy::match_wild_err_arm,
105105
clippy::match_wildcard_for_single_variants,
106106
clippy::mem_forget,
107-
clippy::mismatched_target_os,
108107
clippy::missing_enforced_import_renames,
109108
clippy::mut_mut,
110109
clippy::mutex_integer,
@@ -145,6 +144,9 @@
145144
// NOTE(eddyb) ignored because it's misguided to suggest `let mut s = ...;`
146145
// and `s.push_str(...);` when `+` is equivalent and does not require `let`.
147146
clippy::string_add,
147+
148+
// FIXME(eddyb) rework doc comments to conform to linted expectations.
149+
clippy::too_long_first_doc_paragraph,
148150
)]
149151
// NOTE(eddyb) this is stronger than the "Embark standard lints" above, because
150152
// we almost never need `unsafe` code and this is a further "speed bump" to it.

0 commit comments

Comments
 (0)