Skip to content

Commit

Permalink
Auto merge of #317 - Amanieu:no_pedantic, r=Amanieu
Browse files Browse the repository at this point in the history
Remove pedantic clippy lints from CI

They cause too much trouble with breaking CI.
  • Loading branch information
bors committed Mar 22, 2022
2 parents fb808f1 + ea5f70d commit 8ac6721
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [ "${CROSS}" = "1" ]; then
export CARGO_NET_RETRY=5
export CARGO_NET_TIMEOUT=10

cargo install --git https://github.com/rust-embedded/cross.git
cargo install --locked cross
CARGO=cross
fi

Expand Down
5 changes: 2 additions & 3 deletions ci/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ if retry rustup component add rustfmt ; then
fi

if retry rustup component add clippy ; then
cargo clippy --all --tests --features serde,rayon,bumpalo -- -D clippy::all -D clippy::pedantic
cargo clippy --all --tests --features raw -- -D clippy::all -D clippy::pedantic \
-A clippy::missing_safety_doc -A clippy::missing_errors_doc
cargo clippy --all --tests --features serde,rayon,bumpalo -- -D clippy::all
cargo clippy --all --tests --features raw -- -D clippy::all
fi

if command -v shellcheck ; then
Expand Down
4 changes: 3 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
clippy::must_use_candidate,
clippy::option_if_let_else,
clippy::redundant_else,
clippy::manual_map
clippy::manual_map,
clippy::missing_safety_doc,
clippy::missing_errors_doc
)]
#![warn(missing_docs)]
#![warn(rust_2018_idioms)]
Expand Down
2 changes: 1 addition & 1 deletion src/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5042,7 +5042,7 @@ mod test_map {
let mut m = HashMap::new();
assert!(m.insert(1, 2).is_none());
assert_eq!(*m.get(&1).unwrap(), 2);
assert!(!m.insert(1, 3).is_none());
assert!(m.insert(1, 3).is_some());
assert_eq!(*m.get(&1).unwrap(), 3);
}

Expand Down
2 changes: 1 addition & 1 deletion src/raw/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ impl<A: Allocator + Clone> RawTableInner<A> {

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

0 comments on commit 8ac6721

Please sign in to comment.