Skip to content

Commit 40642c8

Browse files
authored
Fix build warnings (#589)
* Ignore `cfg(fuzzing)` * Remove `cfg(feature = "total_cmp")`
1 parent e9329e2 commit 40642c8

File tree

18 files changed

+50
-15
lines changed

18 files changed

+50
-15
lines changed

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ members = [
2020
]
2121
resolver = "2"
2222

23+
[workspace.lints.rust]
24+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
25+
2326
[profile.dev]
2427
opt-level = 0

constraints/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ env_logger = "0.11.3"
2020
lazy_static = "1"
2121
serde_json = { version = "1", features = ["preserve_order"] }
2222

23+
[lints]
24+
workspace = true
25+
2326
[features]
2427
default = ["serde"]
2528
serde = ["dep:serde", "indexmap/serde"]

constraints/src/algorithms/select_settings/select_optimal.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,8 @@ where
1010
for (candidate, fitness_distance) in candidates {
1111
use std::cmp::Ordering;
1212

13-
#[cfg(feature = "total_cmp")]
1413
let ordering = fitness_distance.total_cmp(&optimal_fitness_distance);
1514

16-
// TODO: remove fallback once MSRV has been bumped to 1.62 or later:
17-
#[cfg(not(feature = "total_cmp"))]
18-
let ordering = {
19-
// See http://doc.rust-lang.org/1.65.0/core/primitive.f64.html#method.total_cmp:
20-
21-
let mut left = fitness_distance.to_bits() as i64;
22-
let mut right = optimal_fitness_distance.to_bits() as i64;
23-
24-
left ^= (((left >> 63) as u64) >> 1) as i64;
25-
right ^= (((right >> 63) as u64) >> 1) as i64;
26-
27-
left.cmp(&right)
28-
};
29-
3015
if ordering == Ordering::Less {
3116
// Candidate is new optimal, so drop current selection:
3217
optimal_candidates.clear();

data/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ portable-atomic = "1.6"
3434
tokio-test = "0.4" # must match the min version of the `tokio` crate above
3535
env_logger = "0.11.3"
3636
chrono = "0.4.28"
37+
38+
[lints]
39+
workspace = true

dtls/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ chrono = "0.4.28"
6060
clap = "3"
6161
hub = {path = "examples/hub"}
6262

63+
[lints]
64+
workspace = true
65+
6366
[features]
6467
pem = ["dep:pem"]
6568

ice/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ lazy_static = "1"
5151
hyper = { version = "0.14.27", features = ["full"] }
5252
sha1 = "0.10"
5353

54+
[lints]
55+
workspace = true
56+
5457
[[example]]
5558
name = "ping_pong"
5659
path = "examples/ping_pong.rs"

interceptor/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ portable-atomic = "1.6"
2727
[dev-dependencies]
2828
tokio-test = "0.4"
2929
chrono = "0.4.28"
30+
31+
[lints]
32+
workspace = true

mdns/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ env_logger = "0.11.3"
3737
chrono = "0.4.28"
3838
clap = "3"
3939

40+
[lints]
41+
workspace = true
42+
4043
[[example]]
4144
name = "mdns_query"
4245
path = "examples/mdns_query.rs"

media/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ rand = "0.8"
2121
criterion = { version = "0.5", features = ["html_reports"] }
2222
nearly_eq = "0.2"
2323

24+
[lints]
25+
workspace = true
26+
2427
[[bench]]
2528
name = "audio_buffer"
2629
harness = false

rtcp/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ util = { version = "0.9.0", path = "../util", package = "webrtc-util", default-f
1414

1515
bytes = "1"
1616
thiserror = "1"
17+
18+
[lints]
19+
workspace = true

0 commit comments

Comments
 (0)