Merge remote-tracking branch 'origin/master' into testing_refactor

This commit is contained in:
Oliver Schneider 2017-05-23 12:31:06 +02:00
commit 6831ecd3fd
No known key found for this signature in database
GPG key ID: 1D5CB4FC597C3004
6 changed files with 8 additions and 7 deletions

View file

@ -1,6 +1,9 @@
# Change Log
All notable changes to this project will be documented in this file.
## 0.0.134 - 2017-05-19
* Update to *rustc 1.19.0-nightly (0ed1ec9f9 2017-05-18)*
## 0.0.133 - 2017-05-14
* Update to *rustc 1.19.0-nightly (826d8f385 2017-05-13)*

View file

@ -1,6 +1,6 @@
[package]
name = "clippy"
version = "0.0.133"
version = "0.0.134"
authors = [
"Manish Goregaokar <manishsmail@gmail.com>",
"Andre Bogus <bogusandre@gmail.com>",
@ -31,7 +31,7 @@ test = false
[dependencies]
# begin automatic update
clippy_lints = { version = "0.0.133", path = "clippy_lints" }
clippy_lints = { version = "0.0.134", path = "clippy_lints" }
# end automatic update
cargo_metadata = "0.2"

View file

@ -1,7 +1,7 @@
[package]
name = "clippy_lints"
# begin automatic update
version = "0.0.133"
version = "0.0.134"
# end automatic update
authors = [
"Manish Goregaokar <manishsmail@gmail.com>",

View file

@ -325,8 +325,6 @@ pub fn implements_trait<'a, 'tcx>(
ty_params: &[ty::Ty<'tcx>],
parent_node_id: Option<NodeId>
) -> bool {
cx.tcx.populate_implementations_for_trait_if_necessary(trait_id);
let ty = cx.tcx.erase_regions(&ty);
let mut b = if let Some(id) = parent_node_id {
cx.tcx.infer_ctxt(BodyId { node_id: id }, Reveal::All)

View file

@ -4,7 +4,7 @@ set -e
./util/update_lints.py
git status --short | sort | grep -v README.md | grep -v helper.txt > helper.txt
git status --short | sort | grep -v README.md | grep -v helper.txt | sort > helper.txt
# abort if the files differ
diff "publish.files" "helper.txt"

View file

@ -1,3 +1,3 @@
M CHANGELOG.md
M Cargo.toml
M CHANGELOG.md
M clippy_lints/Cargo.toml