Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 23:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3371 from matthiaskrgr/temp_breakage_fix

Browse source 
merge various PRs to make CI green again
This commit is contained in:
Philipp Hansch 2018-10-28 17:51:09 +01:00 committed by GitHub
commit 1652393a47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.travis.yml
View file

@ -75,13 +75,14 @@ matrix:
- os: windows
script:
- |
rm rust-toolchain
cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH
rustup default master
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
# - |
# rm rust-toolchain
# cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
# RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
# travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH
# rustup default master
# export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
- |
if [ -z ${INTEGRATION} ]; then
./ci/base-tests.sh && sleep 5

2
Cargo.toml
View file

@ -48,7 +48,7 @@ rustc_tools_util = { version = "0.1.0", path = "rustc_tools_util"}
[dev-dependencies]
clippy_dev = { version = "0.0.1", path = "clippy_dev" }
cargo_metadata = "0.6"
compiletest_rs = "0.3.7"
compiletest_rs = { git = "https://github.com/laumann/compiletest-rs", rev = "12c980f47971b5ba6beb7cb2ffebf8b32f6766ea" }
lazy_static = "1.0"
serde_derive = "1.0"
clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }

11
appveyor.yml
View file

@ -20,11 +20,12 @@ install:
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt
- set /p RUSTC_HASH=<rustc-hash.txt
- del rust-toolchain
- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
- rustup-toolchain-install-master %RUSTC_HASH% -f -n master
- rustup default master
- set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
# - del rust-toolchain
# - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
# - rustup-toolchain-install-master %RUSTC_HASH% -f -n master
# - rustup default master
# - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
- rustc -V
- cargo -V

4
clippy_lints/src/redundant_clone.rs
View file

@ -12,7 +12,7 @@ use crate::rustc::hir::{def_id, Body, FnDecl};
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use crate::rustc::mir::{
self, traversal,
visit::{PlaceContext, Visitor},
visit::{MutatingUseContext, NonUseContext, PlaceContext, Visitor},
TerminatorKind,
};
use crate::rustc::ty;
@ -279,7 +279,7 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor {
fn visit_local(&mut self, local: &mir::Local, ctx: PlaceContext<'tcx>, _: mir::Location) {
match ctx {
PlaceContext::Drop | PlaceContext::StorageDead => return,
PlaceContext::MutatingUse(MutatingUseContext::Drop) | PlaceContext::NonUse(NonUseContext::StorageDead) => return,
_ => {},
}