nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Auto merge of #3603 - xfix:random-state-lint, r=phansch"

Browse Source 
This reverts commit 0a6593cd1b, reversing
changes made to 5277a1fb6c.

This hopefully fixes #3628
This commit is contained in:
Matthias Krüger 2019-01-05 10:19:04 +01:00
parent d264e406be
commit 3389a68834
7 changed files with 1 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -814,7 +814,6 @@ All notable changes to this project will be documented in this file.
[`ptr_offset_with_cast`]: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_offset_with_cast
[`pub_enum_variant_names`]: https://rust-lang.github.io/rust-clippy/master/index.html#pub_enum_variant_names
[`question_mark`]: https://rust-lang.github.io/rust-clippy/master/index.html#question_mark
[`random_state`]: https://rust-lang.github.io/rust-clippy/master/index.html#random_state
[`range_minus_one`]: https://rust-lang.github.io/rust-clippy/master/index.html#range_minus_one
[`range_plus_one`]: https://rust-lang.github.io/rust-clippy/master/index.html#range_plus_one
[`range_step_by_zero`]: https://rust-lang.github.io/rust-clippy/master/index.html#range_step_by_zero

2
README.md
View File

@ -7,7 +7,7 @@
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
[There are 291 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
[There are 290 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:

3
clippy_lints/src/lib.rs
View File

@ -180,7 +180,6 @@ pub mod precedence;
pub mod ptr;
pub mod ptr_offset_with_cast;
pub mod question_mark;
pub mod random_state;
pub mod ranges;
pub mod redundant_clone;
pub mod redundant_field_names;
@ -487,7 +486,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
reg.register_late_lint_pass(box ptr_offset_with_cast::Pass);
reg.register_late_lint_pass(box redundant_clone::RedundantClone);
reg.register_late_lint_pass(box slow_vector_initialization::Pass);
reg.register_late_lint_pass(box random_state::Pass);
reg.register_lint_group("clippy::restriction", Some("clippy_restriction"), vec![
arithmetic::FLOAT_ARITHMETIC,
@ -1027,7 +1025,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
fallible_impl_from::FALLIBLE_IMPL_FROM,
mutex_atomic::MUTEX_INTEGER,
needless_borrow::NEEDLESS_BORROW,
random_state::RANDOM_STATE,
redundant_clone::REDUNDANT_CLONE,
unwrap::PANICKING_UNWRAP,
unwrap::UNNECESSARY_UNWRAP,

50
clippy_lints/src/random_state.rs
View File

@ -1,50 +0,0 @@
use crate::utils::{match_type, paths, span_lint};
use rustc::hir::Ty;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use rustc::ty::subst::UnpackedKind;
use rustc::ty::TyKind;
use rustc::{declare_tool_lint, lint_array};
/// **What it does:** Checks for usage of `RandomState`
///
/// **Why is this bad?** Some applications don't need collision prevention
/// which lowers the performance.
///
/// **Known problems:** None.
///
/// **Example:**
/// ```rust
/// fn x() {
/// let mut map = std::collections::HashMap::new();
/// map.insert(3, 4);
/// }
/// ```
declare_clippy_lint! {
pub RANDOM_STATE,
nursery,
"use of RandomState"
}
pub struct Pass;
impl LintPass for Pass {
fn get_lints(&self) -> LintArray {
lint_array!(RANDOM_STATE)
}
}
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
fn check_ty(&mut self, cx: &LateContext<'a, 'tcx>, ty: &Ty) {
if let Some(tys) = cx.tables.node_id_to_type_opt(ty.hir_id) {
if let TyKind::Adt(_, substs) = tys.sty {
for subst in substs {
if let UnpackedKind::Type(build_hasher) = subst.unpack() {
if match_type(cx, build_hasher, &paths::RANDOM_STATE) {
span_lint(cx, RANDOM_STATE, ty.span, "usage of RandomState");
}
}
}
}
}
}
}

1
clippy_lints/src/utils/paths.rs
View File

@ -73,7 +73,6 @@ pub const PATH_BUF: [&str; 3] = ["std", "path", "PathBuf"];
pub const PATH_TO_PATH_BUF: [&str; 4] = ["std", "path", "Path", "to_path_buf"];
pub const PTR_NULL: [&str; 2] = ["ptr", "null"];
pub const PTR_NULL_MUT: [&str; 2] = ["ptr", "null_mut"];
pub const RANDOM_STATE: [&str; 5] = ["std", "collections", "hash", "map", "RandomState"];
pub const RANGE: [&str; 3] = ["core", "ops", "Range"];
pub const RANGE_ARGUMENT_TRAIT: [&str; 3] = ["core", "ops", "RangeBounds"];
pub const RANGE_FROM: [&str; 3] = ["core", "ops", "RangeFrom"];

19
tests/ui/random_state.rs
View File

@ -1,19 +0,0 @@
#![warn(clippy::random_state)]
use std::collections::hash_map::RandomState;
use std::collections::hash_map::{DefaultHasher, HashMap};
use std::hash::BuildHasherDefault;
fn main() {
// Should warn
let mut map = HashMap::new();
map.insert(3, 4);
let mut map = HashMap::with_hasher(RandomState::new());
map.insert(true, false);
let _map: HashMap<_, _> = vec![(2, 3)].into_iter().collect();
let _vec: Vec<HashMap<i32, i32>>;
// Shouldn't warn
let _map: HashMap<i32, i32, BuildHasherDefault<DefaultHasher>> = HashMap::default();
let mut map = HashMap::with_hasher(BuildHasherDefault::<DefaultHasher>::default());
map.insert("a", "b");
}

28
tests/ui/random_state.stderr
View File

@ -1,28 +0,0 @@
error: usage of RandomState
--> $DIR/random_state.rs:9:19
|
LL | let mut map = HashMap::new();
| ^^^^^^^^^^^^
|
= note: `-D clippy::random-state` implied by `-D warnings`
error: usage of RandomState
--> $DIR/random_state.rs:11:19
|
LL | let mut map = HashMap::with_hasher(RandomState::new());
| ^^^^^^^^^^^^^^^^^^^^
error: usage of RandomState
--> $DIR/random_state.rs:13:15
|
LL | let _map: HashMap<_, _> = vec![(2, 3)].into_iter().collect();
| ^^^^^^^^^^^^^
error: usage of RandomState
--> $DIR/random_state.rs:14:19
|
LL | let _vec: Vec<HashMap<i32, i32>>;
| ^^^^^^^^^^^^^^^^^
error: aborting due to 4 previous errors