mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-16 01:38:09 +00:00
Auto merge of #4302 - matthiaskrgr:rustup_13, r=phansch
rustup https://github.com/rust-lang/rust/pull/62964 changelog: none
This commit is contained in:
commit
5441cf26a0
4 changed files with 4 additions and 3 deletions
|
@ -22,7 +22,7 @@ env:
|
|||
install:
|
||||
- |
|
||||
if [ -z ${INTEGRATION} ]; then
|
||||
rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
|
||||
# rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
|
||||
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||
. $HOME/.nvm/nvm.sh
|
||||
nvm install stable
|
||||
|
|
|
@ -22,7 +22,7 @@ install:
|
|||
- del rust-toolchain
|
||||
- cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
|
||||
- rustup-toolchain-install-master %RUSTC_HASH% -f -n master
|
||||
- rustup component add rustfmt --toolchain nightly
|
||||
#- rustup component add rustfmt --toolchain nightly
|
||||
- rustup default master
|
||||
- set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
|
||||
- rustc -V
|
||||
|
|
|
@ -193,7 +193,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue {
|
|||
|
||||
if_chain! {
|
||||
if !is_self(arg);
|
||||
if !ty.is_mutable_pointer();
|
||||
if !ty.is_mutable_ptr();
|
||||
if !is_copy(cx, ty);
|
||||
if !whitelisted_traits.iter().any(|&t| implements_trait(cx, ty, t, &[]));
|
||||
if !implements_borrow_trait;
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#[test]
|
||||
#[ignore]
|
||||
fn fmt() {
|
||||
if option_env!("RUSTC_TEST_SUITE").is_some() {
|
||||
return;
|
||||
|
|
Loading…
Reference in a new issue