Tweaks: Changes needed to pass cargo test locally

Author: utkrsharmaa

CHANGELOG.md

@@ -6556,6 +6556,7 @@ Released 2018-09-13
 [`source-item-ordering`]: https://doc.rust-lang.org/clippy/lint_configuration.html#source-item-ordering
 [`stack-size-threshold`]: https://doc.rust-lang.org/clippy/lint_configuration.html#stack-size-threshold
 [`standard-macro-braces`]: https://doc.rust-lang.org/clippy/lint_configuration.html#standard-macro-braces
+[`strict-order-of-use`]: https://doc.rust-lang.org/clippy/lint_configuration.html#strict-order-of-use
 [`struct-field-name-threshold`]: https://doc.rust-lang.org/clippy/lint_configuration.html#struct-field-name-threshold
 [`suppress-restriction-lint-in-const`]: https://doc.rust-lang.org/clippy/lint_configuration.html#suppress-restriction-lint-in-const
 [`too-large-for-stack`]: https://doc.rust-lang.org/clippy/lint_configuration.html#too-large-for-stack

book/src/lint_configuration.md

@@ -957,6 +957,16 @@ could be used with a full path two `MacroMatcher`s have to be added one with the
 * [`nonstandard_macro_braces`](https://rust-lang.github.io/rust-clippy/master/index.html#nonstandard_macro_braces)
 
 
+## `strict-order-of-use`
+Makes the lint strict, use statements must precede mod and extern crate statements too. (Stylistic Choice)
+
+**Default Value:** `false`
+
+---
+**Affected lints:**
+* [`items_before_use`](https://rust-lang.github.io/rust-clippy/master/index.html#items_before_use)
+
+
 ## `struct-field-name-threshold`
 The minimum number of struct fields for the lints about field names to trigger
 

clippy_config/src/conf.rs

@@ -804,6 +804,9 @@ define_Conf! {
     /// `crate_name::macro_name` and one with just the macro name.
     #[lints(nonstandard_macro_braces)]
     standard_macro_braces: Vec<MacroMatcher> = Vec::new(),
+    /// Makes the lint strict, use statements must precede mod and extern crate statements too. (Stylistic Choice)
+    #[lints(items_before_use)]
+    strict_order_of_use: bool = false,
     /// The minimum number of struct fields for the lints about field names to trigger
     #[lints(struct_field_names)]
     struct_field_name_threshold: u64 = 3,
@@ -856,9 +859,6 @@ define_Conf! {
     /// Whether to also emit warnings for unsafe blocks with metavariable expansions in **private** macros.
     #[lints(macro_metavars_in_unsafe)]
     warn_unsafe_macro_metavars_in_private_macros: bool = false,
-    /// Makes the lint strict, use statements must precede mod and extern crate statements too. (Stylistic Choice)
-    #[lints(items_before_use)]
-    strict_order_of_use: bool = false,
 }
 
 /// Search for the configuration file.

clippy_lints/src/booleans.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::items_before_use)]
 use clippy_config::Conf;
 use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_hir_and_then};
 use clippy_utils::msrvs::{self, Msrv};

clippy_lints/src/infinite_iter.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::items_before_use)]
 use clippy_utils::diagnostics::span_lint;
 use clippy_utils::ty::{get_type_diagnostic_name, implements_trait};
 use clippy_utils::{higher, sym};

clippy_lints/src/items_before_use.rs

@@ -1,7 +1,7 @@
 use clippy_config::Conf;
 use clippy_utils::diagnostics::span_lint_and_note;
 use clippy_utils::sym;
-use rustc_hir::*;
+use rustc_hir::{HirId, Item, ItemKind, Mod};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::impl_lint_pass;
 

clippy_lints/src/lib.rs

@@ -17,7 +17,8 @@
     clippy::must_use_candidate,
     rustc::diagnostic_outside_of_impl,
     rustc::untranslatable_diagnostic,
-    clippy::literal_string_with_formatting_args
+    clippy::literal_string_with_formatting_args,
+    clippy::items_before_use
 )]
 #![warn(
     trivial_casts,

tests/ui/infinite_iter.rs

@@ -1,4 +1,8 @@
-#![allow(clippy::uninlined_format_args, clippy::double_ended_iterator_last)]
+#![allow(
+    clippy::uninlined_format_args,
+    clippy::double_ended_iterator_last,
+    clippy::items_before_use
+)]
 
 use std::iter::repeat;
 fn square_is_lower_64(x: &u32) -> bool {

tests/ui/infinite_iter.stderr

@@ -1,29 +1,29 @@
 error: infinite iteration detected
-  --> tests/ui/infinite_iter.rs:11:5
+  --> tests/ui/infinite_iter.rs:15:5
    |
 LL |     repeat(0_u8).collect::<Vec<_>>();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
-  --> tests/ui/infinite_iter.rs:9:8
+  --> tests/ui/infinite_iter.rs:13:8
    |
 LL | #[deny(clippy::infinite_iter)]
    |        ^^^^^^^^^^^^^^^^^^^^^
 
 error: infinite iteration detected
-  --> tests/ui/infinite_iter.rs:15:5
+  --> tests/ui/infinite_iter.rs:19:5
    |
 LL |     (0..8_u32).take_while(square_is_lower_64).cycle().count();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: infinite iteration detected
-  --> tests/ui/infinite_iter.rs:19:5
+  --> tests/ui/infinite_iter.rs:23:5
    |
 LL |     (0..8_u64).chain(0..).max();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: infinite iteration detected
-  --> tests/ui/infinite_iter.rs:28:5
+  --> tests/ui/infinite_iter.rs:32:5
    |
 LL | /     (0..8_u32)
 LL | |
@@ -34,37 +34,37 @@ LL | |         .for_each(|x| println!("{}", x));
    | |________________________________________^
 
 error: infinite iteration detected
-  --> tests/ui/infinite_iter.rs:37:5
+  --> tests/ui/infinite_iter.rs:41:5
    |
 LL |     (0_usize..).flat_map(|x| 0..x).product::<usize>();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: infinite iteration detected
-  --> tests/ui/infinite_iter.rs:41:5
+  --> tests/ui/infinite_iter.rs:45:5
    |
 LL |     (0_u64..).filter(|x| x % 2 == 0).last();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: possible infinite iteration detected
-  --> tests/ui/infinite_iter.rs:53:5
+  --> tests/ui/infinite_iter.rs:57:5
    |
 LL |     (0..).zip((0..).take_while(square_is_lower_64)).count();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
-  --> tests/ui/infinite_iter.rs:50:8
+  --> tests/ui/infinite_iter.rs:54:8
    |
 LL | #[deny(clippy::maybe_infinite_iter)]
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: possible infinite iteration detected
-  --> tests/ui/infinite_iter.rs:57:5
+  --> tests/ui/infinite_iter.rs:61:5
    |
 LL |     repeat(42).take_while(|x| *x == 42).chain(0..42).max();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: possible infinite iteration detected
-  --> tests/ui/infinite_iter.rs:61:5
+  --> tests/ui/infinite_iter.rs:65:5
    |
 LL | /     (1..)
 LL | |
@@ -76,31 +76,31 @@ LL | |         .min();
    | |______________^
 
 error: possible infinite iteration detected
-  --> tests/ui/infinite_iter.rs:69:5
+  --> tests/ui/infinite_iter.rs:73:5
    |
 LL |     (0..).find(|x| *x == 24);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: possible infinite iteration detected
-  --> tests/ui/infinite_iter.rs:73:5
+  --> tests/ui/infinite_iter.rs:77:5
    |
 LL |     (0..).position(|x| x == 24);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: possible infinite iteration detected
-  --> tests/ui/infinite_iter.rs:77:5
+  --> tests/ui/infinite_iter.rs:81:5
    |
 LL |     (0..).any(|x| x == 24);
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 error: possible infinite iteration detected
-  --> tests/ui/infinite_iter.rs:81:5
+  --> tests/ui/infinite_iter.rs:85:5
    |
 LL |     (0..).all(|x| x == 24);
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 error: infinite iteration detected
-  --> tests/ui/infinite_iter.rs:107:31
+  --> tests/ui/infinite_iter.rs:111:31
    |
 LL |         let _: HashSet<i32> = (0..).collect();
    |                               ^^^^^^^^^^^^^^^