Skip to content
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

Preparation for Rust 1.80. #500

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Preparation for Rust 1.80. #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b2a85f
Deps: Bump `serde` and `toml_edit` for minimal-versions compatibility.
kpreid Jul 21, 2024
0647f20
Clippy: configure `ignore-interior-mutability`.
kpreid Jul 21, 2024
3e6d68b
Lint: temporarily disable `unused_qualifications`.
kpreid Jul 21, 2024
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
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ rectangle-pack = "0.4.2"
rendiff = { version = "0.2.0" }
scopeguard = { version = "1.2.0", default-features = false }
send_wrapper = { version = "0.6.0", features = ["futures"] }
serde = { version = "1.0.160", default-features = false, features = ["derive"] }
serde = { version = "1.0.204", default-features = false, features = ["derive"] }
serde_json = "1.0.79"
simplelog = { version = "0.12.0", default-features = false, features = ["local-offset"] }
snapbox = "0.6.10" # keep in sync with `trycmd`
Expand Down Expand Up @@ -159,7 +159,8 @@ rust.trivial_numeric_casts = "warn"
rust.unnameable_types = "warn"
rust.unused_extern_crates = "warn"
rust.unused_lifetimes = "warn"
rust.unused_qualifications = "warn"
# TODO: Reenable unused_qualifications when Rust 1.80 is released and we've updated our `mem::size_of` calls.
# rust.unused_qualifications = "warn"
# This lint has false positives on dev-dependencies. Occasionally turn it on to audit non-dev deps.
# rust.unused_crate_dependencies = "warn"

Expand Down
3 changes: 2 additions & 1 deletion all-is-cubes-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ rust.trivial_numeric_casts = "warn"
rust.unnameable_types = "warn"
rust.unused_extern_crates = "warn"
rust.unused_lifetimes = "warn"
rust.unused_qualifications = "warn"
# TODO: Reenable unused_qualifications when Rust 1.80 is released and we've updated our `mem::size_of` calls.
# rust.unused_qualifications = "warn"
# This lint has false positives on dev-dependencies. Occasionally turn it on to audit non-dev deps.
# rust.unused_crate_dependencies = "warn"

Expand Down
9 changes: 9 additions & 0 deletions clippy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ doc-valid-idents = ["glTF", "sRGB", "DirectX", "MagicaVoxel", "NaN", "OpenGL", "
enforced-import-renames = [
{ path = "all_is_cubes::rerun_glue", rename = "rg" },
]
ignore-interior-mutability = [
# Workaround for https://github.com/rust-lang/rust-clippy/issues/12951
"all_is_cubes::block::Block", # contains ArcStr
"all_is_cubes::block::BlockAttributes", # contains ArcStr
"all_is_cubes::block::EvaluatedBlock", # contains ArcStr
"arcstr::ArcStr",
"arcstr::SubStr",
"test_renderers::harness::UniverseFuture", # contains futures::Shared but does not use it as key
]

# --- Configurations for "large values" kinds of lints ---
# It'd be nice if these were per-package/per-crate, but clippy doesn't support that,
Expand Down
2 changes: 1 addition & 1 deletion tools/xtask/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ anyhow = { workspace = true }
cargo_metadata = "0.8.2"
clap = { workspace = true }
once_cell = { workspace = true }
toml_edit = { version = "0.22.7" }
toml_edit = { version = "0.22.13" }
walkdir = "2.3.2"
xshell = "0.1.17"

Expand Down