Skip to content

Commit 8ac6721

Browse files
committed
Auto merge of #317 - Amanieu:no_pedantic, r=Amanieu
Remove pedantic clippy lints from CI They cause too much trouble with breaking CI.
2 parents fb808f1 + ea5f70d commit 8ac6721

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [ "${CROSS}" = "1" ]; then
2222
export CARGO_NET_RETRY=5
2323
export CARGO_NET_TIMEOUT=10
2424

25-
cargo install --git https://github.com/rust-embedded/cross.git
25+
cargo install --locked cross
2626
CARGO=cross
2727
fi
2828

ci/tools.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ if retry rustup component add rustfmt ; then
3030
fi
3131

3232
if retry rustup component add clippy ; then
33-
cargo clippy --all --tests --features serde,rayon,bumpalo -- -D clippy::all -D clippy::pedantic
34-
cargo clippy --all --tests --features raw -- -D clippy::all -D clippy::pedantic \
35-
-A clippy::missing_safety_doc -A clippy::missing_errors_doc
33+
cargo clippy --all --tests --features serde,rayon,bumpalo -- -D clippy::all
34+
cargo clippy --all --tests --features raw -- -D clippy::all
3635
fi
3736

3837
if command -v shellcheck ; then

src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
clippy::must_use_candidate,
3232
clippy::option_if_let_else,
3333
clippy::redundant_else,
34-
clippy::manual_map
34+
clippy::manual_map,
35+
clippy::missing_safety_doc,
36+
clippy::missing_errors_doc
3537
)]
3638
#![warn(missing_docs)]
3739
#![warn(rust_2018_idioms)]

src/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5042,7 +5042,7 @@ mod test_map {
50425042
let mut m = HashMap::new();
50435043
assert!(m.insert(1, 2).is_none());
50445044
assert_eq!(*m.get(&1).unwrap(), 2);
5045-
assert!(!m.insert(1, 3).is_none());
5045+
assert!(m.insert(1, 3).is_some());
50465046
assert_eq!(*m.get(&1).unwrap(), 3);
50475047
}
50485048

src/raw/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ impl<A: Allocator + Clone> RawTableInner<A> {
12681268

12691269
#[inline]
12701270
unsafe fn record_item_insert_at(&mut self, index: usize, old_ctrl: u8, hash: u64) {
1271-
self.growth_left -= special_is_empty(old_ctrl) as usize;
1271+
self.growth_left -= usize::from(special_is_empty(old_ctrl));
12721272
self.set_ctrl_h2(index, hash);
12731273
self.items += 1;
12741274
}

0 commit comments

Comments
 (0)