Merge branch 'master' into version_ids

Author: oli-obk

.travis.yml

@@ -52,14 +52,14 @@ matrix:
     - os: windows
       env: BASE_TEST=true
     - env: INTEGRATION=rust-lang/cargo
-    - env: INTEGRATION=rust-lang-nursery/rand
+    - env: INTEGRATION=rust-random/rand
     - env: INTEGRATION=rust-lang-nursery/stdsimd
-    - env: INTEGRATION=rust-lang-nursery/rustfmt
+    - env: INTEGRATION=rust-lang/rustfmt
     - env: INTEGRATION=rust-lang-nursery/futures-rs
     - env: INTEGRATION=rust-lang-nursery/failure
     - env: INTEGRATION=rust-lang-nursery/log
     - env: INTEGRATION=rust-lang-nursery/chalk
-    - env: INTEGRATION=rust-lang-nursery/rls
+    - env: INTEGRATION=rust-lang/rls
     - env: INTEGRATION=chronotope/chrono
     - env: INTEGRATION=serde-rs/serde
     - env: INTEGRATION=Geal/nom

CHANGELOG.md

@@ -35,27 +35,27 @@ High level approach:
 
 All issues on Clippy are mentored, if you want help with a bug just ask @Manishearth, @llogiq, @mcarton or @oli-obk.
 
-Some issues are easier than others. The [`good first issue`](https://github.com/rust-lang-nursery/rust-clippy/labels/good%20first%20issue)
+Some issues are easier than others. The [`good first issue`](https://github.com/rust-lang/rust-clippy/labels/good%20first%20issue)
 label can be used to find the easy issues. If you want to work on an issue, please leave a comment
 so that we can assign it to you!
 
-Issues marked [`T-AST`](https://github.com/rust-lang-nursery/rust-clippy/labels/T-AST) involve simple
+Issues marked [`T-AST`](https://github.com/rust-lang/rust-clippy/labels/T-AST) involve simple
 matching of the syntax tree structure, and are generally easier than
-[`T-middle`](https://github.com/rust-lang-nursery/rust-clippy/labels/T-middle) issues, which involve types
+[`T-middle`](https://github.com/rust-lang/rust-clippy/labels/T-middle) issues, which involve types
 and resolved paths.
 
-[`T-AST`](https://github.com/rust-lang-nursery/rust-clippy/labels/T-AST) issues will generally need you to match against a predefined syntax structure. To figure out
+[`T-AST`](https://github.com/rust-lang/rust-clippy/labels/T-AST) issues will generally need you to match against a predefined syntax structure. To figure out
 how this syntax structure is encoded in the AST, it is recommended to run `rustc -Z ast-json` on an
 example of the structure and compare with the
 [nodes in the AST docs](https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ast). Usually
 the lint will end up to be a nested series of matches and ifs,
-[like so](https://github.com/rust-lang-nursery/rust-clippy/blob/de5ccdfab68a5e37689f3c950ed1532ba9d652a0/src/misc.rs#L34).
+[like so](https://github.com/rust-lang/rust-clippy/blob/de5ccdfab68a5e37689f3c950ed1532ba9d652a0/src/misc.rs#L34).
 
-[`E-medium`](https://github.com/rust-lang-nursery/rust-clippy/labels/E-medium) issues are generally
+[`E-medium`](https://github.com/rust-lang/rust-clippy/labels/E-medium) issues are generally
 pretty easy too, though it's recommended you work on an E-easy issue first. They are mostly classified
 as `E-medium`, since they might be somewhat involved code wise, but not difficult per-se.
 
-[`T-middle`](https://github.com/rust-lang-nursery/rust-clippy/labels/T-middle) issues can
+[`T-middle`](https://github.com/rust-lang/rust-clippy/labels/T-middle) issues can
 be more involved and require verifying types. The
 [`ty`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty) module contains a
 lot of methods that are useful, though one of the most useful would be `expr_ty` (gives the type of
@@ -152,6 +152,18 @@ Manually testing against an example file is useful if you have added some
 local modifications, run `env CLIPPY_TESTS=true cargo run --bin clippy-driver -- -L ./target/debug input.rs`
 from the working copy root.
 
+### Linting Clippy with your changes locally
+
+Clippy CI only passes if all lints defined in the version of the Clippy being
+tested pass (that is, don’t report any suggestions). You can avoid prolonging
+the CI feedback cycle for PRs you submit by running these lints yourself ahead
+of time and addressing any issues found:
+
+```
+cargo build
+`pwd`/target/debug/cargo-clippy clippy --all-targets --all-features -- -D clippy::all -D clippy::internal -D clippy::pedantic
+```
+
 ### How Clippy works
 
 Clippy is a [rustc compiler plugin][compiler_plugin]. The main entry point is at [`src/lib.rs`][main_entry]. In there, the lint registration is delegated to the [`clippy_lints`][lint_crate] crate.
@@ -237,10 +249,10 @@ All code in this repository is under the [Mozilla Public License, 2.0](https://w
 
 <!-- adapted from https://github.com/servo/servo/blob/master/CONTRIBUTING.md -->
 
-[main_entry]: https://github.com/rust-lang-nursery/rust-clippy/blob/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/src/lib.rs#L14
-[lint_crate]: https://github.com/rust-lang-nursery/rust-clippy/tree/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/clippy_lints/src
-[lint_crate_entry]: https://github.com/rust-lang-nursery/rust-clippy/blob/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/clippy_lints/src/lib.rs
-[else_if_without_else]: https://github.com/rust-lang-nursery/rust-clippy/blob/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/clippy_lints/src/else_if_without_else.rs
+[main_entry]: https://github.com/rust-lang/rust-clippy/blob/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/src/lib.rs#L14
+[lint_crate]: https://github.com/rust-lang/rust-clippy/tree/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/clippy_lints/src
+[lint_crate_entry]: https://github.com/rust-lang/rust-clippy/blob/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/clippy_lints/src/lib.rs
+[else_if_without_else]: https://github.com/rust-lang/rust-clippy/blob/c5b39a5917ffc0f1349b6e414fa3b874fdcf8429/clippy_lints/src/else_if_without_else.rs
 [compiler_plugin]: https://doc.rust-lang.org/unstable-book/language-features/plugin.html#lint-plugins
 [plugin_registry]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_plugin/registry/struct.Registry.html
 [reg_early_lint_pass]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_plugin/registry/struct.Registry.html#method.register_early_lint_pass

CONTRIBUTING.md

@@ -9,7 +9,7 @@ authors = [
 	"Oliver Schneider <[email protected]>"
 ]
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
-repository = "https://github.com/rust-lang-nursery/rust-clippy"
+repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
 license = "MIT/Apache-2.0"
 keywords = ["clippy", "lint", "plugin"]
@@ -19,8 +19,8 @@ edition = "2018"
 publish = false
 
 [badges]
-travis-ci = { repository = "rust-lang-nursery/rust-clippy" }
-appveyor = { repository = "rust-lang-nursery/rust-clippy" }
+travis-ci = { repository = "rust-lang/rust-clippy" }
+appveyor = { repository = "rust-lang/rust-clippy" }
 
 [lib]
 name = "clippy"

Cargo.toml

@@ -2,14 +2,14 @@ We are currently in the process of discussing Clippy 1.0 via the RFC process in
 
 # Clippy
 
-[![Build Status](https://travis-ci.org/rust-lang-nursery/rust-clippy.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/rust-clippy)
+[![Build Status](https://travis-ci.org/rust-lang/rust-clippy.svg?branch=master)](https://travis-ci.org/rust-lang/rust-clippy)
 [![Windows Build status](https://ci.appveyor.com/api/projects/status/id677xpw1dguo7iw?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/rust-clippy)
 [![Current Version](https://meritbadge.herokuapp.com/clippy)](https://crates.io/crates/clippy)
 [![License: MIT/Apache-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
 
 A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
 
-[There are 288 lints included in this crate!](https://rust-lang-nursery.github.io/rust-clippy/master/index.html)
+[There are 288 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:
 
@@ -22,7 +22,7 @@ We have a bunch of lint categories to allow you to choose how much Clippy is sup
 * `clippy::cargo` (checks against the cargo manifest)
 * **`clippy::correctness`** (code that is just outright wrong or very very useless)
 
-More to come, please [file an issue](https://github.com/rust-lang-nursery/rust-clippy/issues) if you have ideas!
+More to come, please [file an issue](https://github.com/rust-lang/rust-clippy/issues) if you have ideas!
 
 Only the following of those categories are enabled by default:
 
@@ -84,7 +84,7 @@ in your code, you can use:
 cargo run --bin cargo-clippy --manifest-path=path_to_clippys_Cargo.toml
 ```
 
-*[Note](https://github.com/rust-lang-nursery/rust-clippy/wiki#a-word-of-warning):*
+*[Note](https://github.com/rust-lang/rust-clippy/wiki#a-word-of-warning):*
 Be sure that Clippy was compiled with the same version of rustc that cargo invokes here!
 
 ### Travis CI
@@ -117,7 +117,7 @@ blacklisted-names = ["toto", "tata", "titi"]
 cyclomatic-complexity-threshold = 30
 ```
 
-See the [list of lints](https://rust-lang-nursery.github.io/rust-clippy/master/index.html) for more information about which lints can be configured and the
+See the [list of lints](https://rust-lang.github.io/rust-clippy/master/index.html) for more information about which lints can be configured and the
 meaning of the variables.
 
 To deactivate the “for further information visit *lint-link*” message you can

README.md

@@ -32,7 +32,7 @@ lazy_static! {
         "(?P<desc>(?:[^"\\]+|\\(?s).(?-s))*)"\s*[})]
     "#).unwrap();
     static ref NL_ESCAPE_RE: Regex = Regex::new(r#"\\\n\s*"#).unwrap();
-    pub static ref DOCS_LINK: String = "https://rust-lang-nursery.github.io/rust-clippy/master/index.html".to_string();
+    pub static ref DOCS_LINK: String = "https://rust-lang.github.io/rust-clippy/master/index.html".to_string();
 }
 
 /// Lint data parsed from the Clippy source code.

clippy_dev/src/lib.rs

@@ -82,13 +82,13 @@ fn update_lints(update_mode: &UpdateMode) {
 
     let mut file_change = replace_region_in_file(
         "../README.md",
-        r#"\[There are \d+ lints included in this crate!\]\(https://rust-lang-nursery.github.io/rust-clippy/master/index.html\)"#,
+        r#"\[There are \d+ lints included in this crate!\]\(https://rust-lang.github.io/rust-clippy/master/index.html\)"#,
         "",
         true,
         update_mode == &UpdateMode::Change,
         || {
             vec![
-                format!("[There are {} lints included in this crate!](https://rust-lang-nursery.github.io/rust-clippy/master/index.html)", lint_count)
+                format!("[There are {} lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)", lint_count)
             ]
         }
     ).changed;

clippy_dev/src/main.rs

@@ -7,7 +7,7 @@ readme = "crates-readme.md"
 description = "A bunch of helpful lints to avoid common pitfalls in Rust."
 build = 'build.rs'
 
-repository = "https://github.com/rust-lang-nursery/rust-clippy"
+repository = "https://github.com/rust-lang/rust-clippy"
 
 license = "MIT/Apache-2.0"
 keywords = ["clippy", "lint", "plugin"]

clippy_dummy/Cargo.toml

@@ -6,4 +6,4 @@ rustup component add clippy-preview
 
 on a Rust version 1.29 or later. You may need to run `rustup self update` if it complains about a missing clippy binary.
 
-See [the homepage](https://github.com/rust-lang-nursery/rust-clippy/#clippy) for more information
+See [the homepage](https://github.com/rust-lang/rust-clippy/#clippy) for more information

clippy_dummy/crates-readme.md

@@ -10,7 +10,7 @@ authors = [
 	"Martin Carton <[email protected]>"
 ]
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
-repository = "https://github.com/rust-lang-nursery/rust-clippy"
+repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
 license = "MPL-2.0"
 keywords = ["clippy", "lint", "plugin"]

clippy_lints/Cargo.toml

@@ -1,3 +1,3 @@
 This crate contains Clippy lints. For the main crate, check
 [*crates.io*](https://crates.io/crates/clippy) or
-[GitHub](https://github.com/rust-lang-nursery/rust-clippy).
+[GitHub](https://github.com/rust-lang/rust-clippy).

clippy_lints/README.md

@@ -177,7 +177,7 @@ declare_clippy_lint! {
 ///
 /// **Known problems:** This lint doesn't detect crate level inner attributes, because they get
 /// processed before the PreExpansionPass lints get executed. See
-/// [#3123](https://github.com/rust-lang-nursery/rust-clippy/pull/3123#issuecomment-422321765)
+/// [#3123](https://github.com/rust-lang/rust-clippy/pull/3123#issuecomment-422321765)
 ///
 /// **Example:**
 ///
@@ -537,4 +537,3 @@ impl EarlyLintPass for CfgAttrPass {
         }
     }
 }
-

clippy_lints/src/attrs.rs

@@ -31,7 +31,7 @@ use cargo_metadata;
 /// name = "clippy"
 /// version = "0.0.212"
 /// description = "A bunch of helpful lints to avoid common pitfalls in Rust"
-/// repository = "https://github.com/rust-lang-nursery/rust-clippy"
+/// repository = "https://github.com/rust-lang/rust-clippy"
 /// readme = "README.md"
 /// license = "MIT/Apache-2.0"
 /// keywords = ["clippy", "lint", "plugin"]

clippy_lints/src/cargo_common_metadata.rs

@@ -80,7 +80,7 @@ declare_clippy_lint! {
 ///
 /// **Known problems:** False positive possible with order dependent `match`
 /// (see issue
-/// [#860](https://github.com/rust-lang-nursery/rust-clippy/issues/860)).
+/// [#860](https://github.com/rust-lang/rust-clippy/issues/860)).
 ///
 /// **Example:**
 /// ```rust,ignore

clippy_lints/src/copies.rs

@@ -87,7 +87,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
 
         let mut v = EscapeDelegate {
             cx,
-            set: NodeSet(),
+            set: NodeSet::default(),
             too_large_for_stack: self.too_large_for_stack,
         };
 

clippy_lints/src/escape.rs

@@ -28,7 +28,7 @@ pub struct EtaPass;
 /// **Known problems:** If creating the closure inside the closure has a side-
 /// effect then moving the closure creation out will change when that side-
 /// effect runs.
-/// See https://github.com/rust-lang-nursery/rust-clippy/issues/1439 for more
+/// See https://github.com/rust-lang/rust-clippy/issues/1439 for more
 /// details.
 ///
 /// **Example:**

clippy_lints/src/eta_reduction.rs

@@ -141,7 +141,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NewWithoutDefault {
                                 if let Some(default_trait_id) = get_trait_def_id(cx, &paths::DEFAULT_TRAIT);
                                 then {
                                     if self.impling_types.is_none() {
-                                        let mut impls = NodeSet();
+                                        let mut impls = NodeSet::default();
                                         cx.tcx.for_each_impl(default_trait_id, |d| {
                                             if let Some(ty_def) = cx.tcx.type_of(d).ty_adt_def() {
                                                 if let Some(node_id) = cx.tcx.hir.as_local_node_id(ty_def.did) {