Merge branch 'master' into typos

Author: matthiaskrgr

.travis.yml

@@ -48,8 +48,6 @@ matrix:
     - env: INTEGRATION=serde-rs/serde
     - env: INTEGRATION=Geal/nom
     - env: INTEGRATION=hyperium/hyper
-    - env: INTEGRATION=rust-lang/cargo
-    - env: INTEGRATION=rust-lang-nursery/rls
 
 script:
   - |

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.0.212
+* Rustup to *rustc 1.29.0-nightly (e06c87544 2018-07-06)*
+
 ## 0.0.211
 * Rustup to *rustc 1.28.0-nightly (e3bf634e0 2018-06-28)*
 
@@ -504,7 +507,7 @@ All notable changes to this project will be documented in this file.
 ## 0.0.74 — 2016-06-07
 * Fix bug with `cargo-clippy` JSON parsing
 * Add the `CLIPPY_DISABLE_DOCS_LINKS` environment variable to deactivate the
-  “for further information visit *wiki-link*” message.
+  “for further information visit *lint-link*” message.
 
 ## 0.0.73 — 2016-06-05
 * Fix false positives in [`useless_let_if_seq`]
@@ -609,7 +612,7 @@ All notable changes to this project will be documented in this file.
 [`AsRef`]: https://doc.rust-lang.org/std/convert/trait.AsRef.html
 [configuration file]: ./rust-clippy#configuration
 
-<!-- begin autogenerated links to wiki -->
+<!-- begin autogenerated links to lint list -->
 [`absurd_extreme_comparisons`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#absurd_extreme_comparisons
 [`almost_swapped`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#almost_swapped
 [`approx_constant`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#approx_constant
@@ -744,6 +747,7 @@ All notable changes to this project will be documented in this file.
 [`misaligned_transmute`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#misaligned_transmute
 [`misrefactored_assign_op`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#misrefactored_assign_op
 [`missing_docs_in_private_items`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#missing_docs_in_private_items
+[`missing_inline_in_public_items`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#missing_inline_in_public_items
 [`mixed_case_hex_literals`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#mixed_case_hex_literals
 [`module_inception`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#module_inception
 [`modulo_one`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#modulo_one
@@ -890,4 +894,4 @@ All notable changes to this project will be documented in this file.
 [`zero_prefixed_literal`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#zero_prefixed_literal
 [`zero_ptr`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#zero_ptr
 [`zero_width_space`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#zero_width_space
-<!-- end autogenerated links to wiki -->
+<!-- end autogenerated links to lint list -->

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to rust-clippy
+# Contributing to Clippy
 
 Hello fellow Rustacean! Great to see your interest in compiler internals and lints!
 
@@ -63,7 +63,7 @@ an AST expression). `match_def_path()` in Clippy's `utils` module can also be us
 
 ## Writing code
 
-Compiling clippy from scratch can take almost a minute or more depending on your machine.
+Compiling Clippy from scratch can take almost a minute or more depending on your machine.
 However, since Rust 1.24.0 incremental compilation is enabled by default and compile times for small changes should be quick.
 
 [Llogiq's blog post on lints](https://llogiq.github.io/2015/06/04/workflows.html) is a nice primer
@@ -74,7 +74,7 @@ of this.
 
 ### Author lint
 
-There is also the internal `author` lint to generate clippy code that detects the offending pattern. It does not work for all of the Rust syntax, but can give a good starting point.
+There is also the internal `author` lint to generate Clippy code that detects the offending pattern. It does not work for all of the Rust syntax, but can give a good starting point.
 
 First, create a new UI test file in the `tests/ui/` directory with the pattern you want to match:
 
@@ -93,9 +93,9 @@ a `.stdout` file with the generated code:
 // ./tests/ui/my_lint.stdout
 
 if_chain! {
-    if let Expr_::ExprArray(ref elements) = stmt.node;
+    if let ExprKind::Array(ref elements) = stmt.node;
     if elements.len() == 1;
-    if let Expr_::ExprLit(ref lit) = elements[0].node;
+    if let ExprKind::Lit(ref lit) = elements[0].node;
     if let LitKind::Int(7, _) = lit.node;
     then {
         // report your lint here
@@ -148,7 +148,7 @@ Therefore you should use `tests/ui/update-all-references.sh` (after running
 ### Testing manually
 
 Manually testing against an example file is useful if you have added some
-`println!`s and test suite output becomes unreadable.  To try clippy with your
+`println!`s and test suite output becomes unreadable.  To try Clippy with your
 local modifications, run `cargo run --bin clippy-driver -- -L ./target/debug input.rs` from the
 working copy root.
 
@@ -179,7 +179,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
 ```
 
 The [`rustc_plugin::PluginRegistry`][plugin_registry] provides two methods to register lints: [register_early_lint_pass][reg_early_lint_pass] and [register_late_lint_pass][reg_late_lint_pass].
-Both take an object that implements an [`EarlyLintPass`][early_lint_pass] or [`LateLintPass`][late_lint_pass] respectively. This is done in every single lint. 
+Both take an object that implements an [`EarlyLintPass`][early_lint_pass] or [`LateLintPass`][late_lint_pass] respectively. This is done in every single lint.
 It's worth noting that the majority of `clippy_lints/src/lib.rs` is autogenerated by `util/update_lints.py` and you don't have to add anything by hand. When you are writing your own lint, you can use that script to save you some time.
 
 ```rust

Cargo.toml

@@ -2,7 +2,7 @@ cargo-features = ["edition"]
 
 [package]
 name = "clippy"
-version = "0.0.211"
+version = "0.0.212"
 authors = [
 	"Manish Goregaokar <[email protected]>",
 	"Andre Bogus <[email protected]>",
@@ -40,11 +40,51 @@ path = "src/driver.rs"
 
 [dependencies]
 # begin automatic update
-clippy_lints = { version = "0.0.211", path = "clippy_lints" }
+clippy_lints = { version = "0.0.212", path = "clippy_lints" }
 # end automatic update
 regex = "1"
 semver = "0.9"
 
+# Not actually needed right now but required to make sure that clippy/ and cargo build
+# with the same set of features in rust-lang/rust
+num-traits = "0.2" # enable the default feature
+backtrace = "0.3"
+
+# keep in sync with `cargo`'s `Cargo.toml'
+[target.'cfg(windows)'.dependencies.winapi]
+version = "0.3"
+features = [
+  # keep in sync with `cargo`'s `Cargo.toml'
+  "handleapi",
+  "jobapi",
+  "jobapi2",
+  "minwindef",
+  "ntdef",
+  "ntstatus",
+  "processenv",
+  "processthreadsapi",
+  "psapi",
+  "synchapi",
+  "winerror",
+  "winbase",
+  "wincon",
+  "winnt",
+  # no idea where these come from
+  "basetsd",
+  "lmcons",
+  "memoryapi",
+  "minschannel",
+  "minwinbase",
+  "ntsecapi",
+  "profileapi",
+  "schannel",
+  "securitybaseapi",
+  "synchapi",
+  "sysinfoapi",
+  "timezoneapi",
+  "wincrypt",
+]
+
 [dev-dependencies]
 cargo_metadata = "0.5"
 compiletest_rs = "0.3.7"

PUBLISH.md

@@ -1,7 +1,8 @@
-Steps to publish a new clippy version
+Steps to publish a new Clippy version
 
 - Bump `package.version` in `./Cargo.toml` (no need to manually bump `dependencies.clippy_lints.version`).
 - Write a changelog entry.
+- If a nightly update is needed, update `min_version.txt` using `rustc -vV > min_version.txt`
 - Run `./pre_publish.sh`
 - Review and commit all changed files
 - `git push`

README.md

@@ -1,6 +1,6 @@
-We are currently in the process of discussing Clippy 1.0 via the RFC process in https://github.com/rust-lang/rfcs/pull/2476 . The RFC's goal is to clarify policies around lint categorizations and the policy around which lints should be in the compiler and which lints should be in clippy. Please leave your thoughts on the RFC PR.
+We are currently in the process of discussing Clippy 1.0 via the RFC process in https://github.com/rust-lang/rfcs/pull/2476 . The RFC's goal is to clarify policies around lint categorizations and the policy around which lints should be in the compiler and which lints should be in Clippy. Please leave your thoughts on the RFC PR.
 
-# rust-clippy
+# Clippy
 
 [![Build Status](https://travis-ci.org/rust-lang-nursery/rust-clippy.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/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)
@@ -9,9 +9,9 @@ We are currently in the process of discussing Clippy 1.0 via the RFC process in
 
 A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
 
-[There are 272 lints included in this crate!](https://rust-lang-nursery.github.io/rust-clippy/master/index.html)
+[There are 273 lints included in this crate!](https://rust-lang-nursery.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:
+We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:
 
 * `clippy` (everything that has no false positives)
 * `clippy_pedantic` (everything)
@@ -33,57 +33,59 @@ Table of contents:
 ## Usage
 
 Since this is a tool for helping the developer of a library or application
-write better code, it is recommended not to include clippy as a hard dependency.
+write better code, it is recommended not to include Clippy as a hard dependency.
 Options include using it as an optional dependency, as a cargo subcommand, or
-as an included feature during build. All of these options are detailed below.
+as an included feature during build. These options are detailed below.
 
-As a general rule clippy will only work with the *latest* Rust nightly for now.
+### As a cargo subcommand (`cargo clippy`)
 
-To install Rust nightly, the recommended way is to use [rustup](https://rustup.rs/):
+One way to use Clippy is by installing Clippy through rustup as a cargo
+subcommand.
 
-```terminal
-rustup install nightly
-```
+#### Step 1: Install rustup
 
-### As a cargo subcommand (`cargo clippy`)
+You can install [rustup](http://rustup.rs/) on supported platforms. This will help
+us install clippy and its dependencies.
 
-One way to use clippy is by installing clippy through cargo as a cargo
-subcommand.
+If you already have rustup installed, update to ensure you have the latest
+rustup and compiler:
 
 ```terminal
-cargo +nightly install clippy
+rustup update
 ```
 
-(The `+nightly` is not necessary if your default `rustup` install is nightly)
+#### Step 2: Install nightly toolchain
 
-Now you can run clippy by invoking `cargo +nightly clippy`.
+Rustup integration is still new, you will need a relatively new nightly (2018-07-15 or later).
 
-To update the subcommand together with the latest nightly use the [rust-update](rust-update) script or run:
+To install Rust nightly with [rustup](https://rustup.rs/):
 
 ```terminal
-rustup update nightly
-cargo +nightly install --force clippy
+rustup install nightly
 ```
 
-In case you are not using rustup, you need to set the environment flag
-`SYSROOT` during installation so clippy knows where to find `librustc` and
-similar crates.
+#### Step 3: Install clippy
+
+Once you have rustup and the nightly toolchain installed, run the following command:
 
 ```terminal
-SYSROOT=/path/to/rustc/sysroot cargo install clippy
+rustup component add clippy-preview --toolchain=nightly
 ```
 
-### Running clippy from the command line without installing it
+Now you can run Clippy by invoking `cargo +nightly clippy`. If nightly is your
+default toolchain in rustup, `cargo clippy` will work fine.
+
+### Running Clippy from the command line without installing it
 
-To have cargo compile your crate with clippy without clippy installation
+To have cargo compile your crate with Clippy without Clippy installation
 in your code, you can use:
 
 ```terminal
 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):*
-Be sure that clippy was compiled with the same version of rustc that cargo invokes here!
+Be sure that Clippy was compiled with the same version of rustc that cargo invokes here!
 
 ## Configuration
 
@@ -117,7 +119,7 @@ You can add options  to `allow`/`warn`/`deny`:
 Note: `deny` produces errors instead of warnings.
 
 For convenience, `cargo clippy` automatically defines a `cargo-clippy`
-feature. This lets you set lint levels and compile with or without clippy
+feature. This lets you set lint levels and compile with or without Clippy
 transparently:
 
 ```rust
@@ -126,12 +128,12 @@ transparently:
 
 ## Updating rustc
 
-Sometimes, rustc moves forward without clippy catching up. Therefore updating
-rustc may leave clippy a non-functional state until we fix the resulting
+Sometimes, rustc moves forward without Clippy catching up. Therefore updating
+rustc may leave Clippy a non-functional state until we fix the resulting
 breakage.
 
 You can use the [rust-update](rust-update) script to update rustc only if
-clippy would also update correctly.
+Clippy would also update correctly.
 
 ## License
 

build.rs

@@ -1,8 +1,8 @@
-//! This build script ensures that clippy is not compiled with an
+//! This build script ensures that Clippy is not compiled with an
 //! incompatible version of rust. It will panic with a descriptive
 //! error message instead.
 //!
-//! We specifially want to ensure that clippy is only built with a
+//! We specifially want to ensure that Clippy is only built with a
 //! rustc version that is newer or equal to the one specified in the
 //! `min_version.txt` file.
 //!
@@ -63,7 +63,7 @@ fn check_rustc_version() {
         eprintln!(
             "\n{} {}",
             Red.bold().paint("error:"),
-            "clippy requires a nightly version of Rust."
+            "Clippy requires a nightly version of Rust."
         );
         print_version_err(&current_version, &*current_date_str);
         eprintln!(
@@ -80,7 +80,7 @@ fn check_rustc_version() {
         eprintln!(
             "\n{} {}",
             Red.bold().paint("error:"),
-            "clippy does not support this version of rustc nightly."
+            "Clippy does not support this version of rustc nightly."
         );
         eprintln!(
             "> {}{}{}",

ci/base-tests.sh

@@ -6,6 +6,7 @@ cargo test --features debugging
 mkdir -p ~/rust/cargo/bin
 cp target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy
 cp target/debug/clippy-driver ~/rust/cargo/bin/clippy-driver
+rm ~/.cargo/bin/cargo-clippy
 PATH=$PATH:~/rust/cargo/bin cargo clippy --all -- -D clippy
 cd clippy_workspace_tests && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..
 cd clippy_workspace_tests/src && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../..

ci/integration-tests.sh

@@ -1,4 +1,5 @@
 set -x
+rm ~/.cargo/bin/cargo-clippy
 cargo install --force --path .
 
 echo "Running integration test for crate ${INTEGRATION}"

clippy_lints/Cargo.toml

@@ -3,7 +3,7 @@ cargo-features = ["edition"]
 [package]
 name = "clippy_lints"
 # begin automatic update
-version = "0.0.211"
+version = "0.0.212"
 # end automatic update
 authors = [
 	"Manish Goregaokar <[email protected]>",
@@ -21,8 +21,8 @@ edition = "2018"
 [dependencies]
 cargo_metadata = "0.5"
 itertools = "0.7"
-lazy_static = "1.0"
-matches = "0.1.2"
+lazy_static = "1.0.2"
+matches = "0.1.7"
 quine-mc_cluskey = "0.2.2"
 regex-syntax = "0.6"
 semver = "0.9.0"
@@ -32,7 +32,7 @@ toml = "0.4"
 unicode-normalization = "0.1"
 pulldown-cmark = "0.1"
 url = "1.7.0"
-if_chain = "0.1"
+if_chain = "0.1.3"
 
 [features]
 debugging = []