aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Mitchener <bruce.mitchener@gmail.com>2024-08-02 21:38:56 +0700
committerGitHub <noreply@github.com>2024-08-02 16:38:56 +0200
commit617428e98855d072acd9d332b9782b4159dadfd8 (patch)
treee9b7bf859e5c43dc9c629f529112cb3eadf44b4b
parent364b5b7c37c30af745ad77555d56b6c47ce7de8e (diff)
downloadrapier-617428e98855d072acd9d332b9782b4159dadfd8.tar.gz
rapier-617428e98855d072acd9d332b9782b4159dadfd8.tar.bz2
rapier-617428e98855d072acd9d332b9782b4159dadfd8.zip
Use workspace lints to control unexpected_cfgs. (#682)
By using `workspace.lints`, we can configure lints once for everything (and then inherit it into the various crates). The lint configuration for `unexpected_cfgs` works in 1.80+ and warns otherwise. Co-authored-by: Thierry Berger <contact@thierryberger.com>
-rw-r--r--Cargo.toml8
-rw-r--r--crates/rapier2d-f64/Cargo.toml3
-rw-r--r--crates/rapier2d/Cargo.toml3
-rw-r--r--crates/rapier3d-f64/Cargo.toml3
-rw-r--r--crates/rapier3d/Cargo.toml3
-rw-r--r--crates/rapier_testbed2d-f64/Cargo.toml3
-rw-r--r--crates/rapier_testbed2d/Cargo.toml3
-rw-r--r--crates/rapier_testbed3d-f64/Cargo.toml3
-rw-r--r--crates/rapier_testbed3d/Cargo.toml3
-rw-r--r--src/lib.rs1
-rw-r--r--src_testbed/lib.rs1
11 files changed, 32 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml
index fd16059..1c60f45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,14 @@ members = ["crates/rapier2d", "crates/rapier2d-f64", "crates/rapier_testbed2d",
"crates/rapier3d", "crates/rapier3d-f64", "crates/rapier_testbed3d", "crates/rapier_testbed3d-f64", "examples3d", "examples3d-f64", "benchmarks3d", "crates/rapier3d-urdf", "crates/rapier3d-stl"]
resolver = "2"
+[workspace.lints]
+rust.unexpected_cfgs = { level = "warn", check-cfg = [
+ 'cfg(feature, values("dim2", "dim3", "f32", "f64"))',
+ # The `other-backends` feature isn't in the tested3d-f64
+ # but easier to just ignore it here.
+ 'cfg(feature, values("other-backends"))',
+] }
+
[patch.crates-io]
#wrapped2d = { git = "https://github.com/Bastacyclop/rust_box2d.git" }
#xurdf = { path = "../xurdf/xurdf" }
diff --git a/crates/rapier2d-f64/Cargo.toml b/crates/rapier2d-f64/Cargo.toml
index 2a25f48..49fe36e 100644
--- a/crates/rapier2d-f64/Cargo.toml
+++ b/crates/rapier2d-f64/Cargo.toml
@@ -21,6 +21,9 @@ edition = "2021"
[badges]
maintenance = { status = "actively-developed" }
+[lints]
+workspace = true
+
[features]
default = ["dim2", "f64"]
dim2 = []
diff --git a/crates/rapier2d/Cargo.toml b/crates/rapier2d/Cargo.toml
index 0264f5f..b910304 100644
--- a/crates/rapier2d/Cargo.toml
+++ b/crates/rapier2d/Cargo.toml
@@ -21,6 +21,9 @@ edition = "2021"
[badges]
maintenance = { status = "actively-developed" }
+[lints]
+workspace = true
+
[features]
default = ["dim2", "f32"]
dim2 = []
diff --git a/crates/rapier3d-f64/Cargo.toml b/crates/rapier3d-f64/Cargo.toml
index aadd01a..a56dd6e 100644
--- a/crates/rapier3d-f64/Cargo.toml
+++ b/crates/rapier3d-f64/Cargo.toml
@@ -21,6 +21,9 @@ edition = "2021"
[badges]
maintenance = { status = "actively-developed" }
+[lints]
+workspace = true
+
[features]
default = ["dim3", "f64"]
dim3 = []
diff --git a/crates/rapier3d/Cargo.toml b/crates/rapier3d/Cargo.toml
index 77dd8ae..25b5bb5 100644
--- a/crates/rapier3d/Cargo.toml
+++ b/crates/rapier3d/Cargo.toml
@@ -21,6 +21,9 @@ edition = "2021"
[badges]
maintenance = { status = "actively-developed" }
+[lints]
+workspace = true
+
[features]
default = ["dim3", "f32"]
dim3 = []
diff --git a/crates/rapier_testbed2d-f64/Cargo.toml b/crates/rapier_testbed2d-f64/Cargo.toml
index 0aa3c56..ec56edc 100644
--- a/crates/rapier_testbed2d-f64/Cargo.toml
+++ b/crates/rapier_testbed2d-f64/Cargo.toml
@@ -24,6 +24,9 @@ name = "rapier_testbed2d"
path = "../../src_testbed/lib.rs"
required-features = ["dim2"]
+[lints]
+workspace = true
+
[features]
default = ["dim2"]
dim2 = []
diff --git a/crates/rapier_testbed2d/Cargo.toml b/crates/rapier_testbed2d/Cargo.toml
index 436cb26..6d25ae3 100644
--- a/crates/rapier_testbed2d/Cargo.toml
+++ b/crates/rapier_testbed2d/Cargo.toml
@@ -24,6 +24,9 @@ name = "rapier_testbed2d"
path = "../../src_testbed/lib.rs"
required-features = ["dim2"]
+[lints]
+workspace = true
+
[features]
default = ["dim2"]
dim2 = []
diff --git a/crates/rapier_testbed3d-f64/Cargo.toml b/crates/rapier_testbed3d-f64/Cargo.toml
index 95091dd..7462b07 100644
--- a/crates/rapier_testbed3d-f64/Cargo.toml
+++ b/crates/rapier_testbed3d-f64/Cargo.toml
@@ -24,6 +24,9 @@ name = "rapier_testbed3d"
path = "../../src_testbed/lib.rs"
required-features = ["dim3"]
+[lints]
+workspace = true
+
[features]
default = ["dim3"]
dim3 = []
diff --git a/crates/rapier_testbed3d/Cargo.toml b/crates/rapier_testbed3d/Cargo.toml
index 9b01ccb..5a2d820 100644
--- a/crates/rapier_testbed3d/Cargo.toml
+++ b/crates/rapier_testbed3d/Cargo.toml
@@ -24,6 +24,9 @@ name = "rapier_testbed3d"
path = "../../src_testbed/lib.rs"
required-features = ["dim3"]
+[lints]
+workspace = true
+
[features]
default = ["dim3"]
dim3 = []
diff --git a/src/lib.rs b/src/lib.rs
index cf2503d..8a78e88 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,7 +15,6 @@
#![allow(clippy::too_many_arguments)]
#![allow(clippy::needless_range_loop)] // TODO: remove this? I find that in the math code using indices adds clarity.
#![allow(clippy::module_inception)]
-#![allow(unexpected_cfgs)] // This happens due to the dim2/dim3/f32/f64 cfg.
#[cfg(all(feature = "dim2", feature = "f32"))]
pub extern crate parry2d as parry;
diff --git a/src_testbed/lib.rs b/src_testbed/lib.rs
index e64d025..8702673 100644
--- a/src_testbed/lib.rs
+++ b/src_testbed/lib.rs
@@ -1,5 +1,4 @@
#![allow(clippy::too_many_arguments)]
-#![allow(unexpected_cfgs)] // This happens due to the dim2/dim3/f32/f64 cfg.
extern crate nalgebra as na;