Skip to content

Commit

Permalink
Auto merge of rust-lang#4302 - matthiaskrgr:rustup_13, r=phansch
Browse files Browse the repository at this point in the history
rustup rust-lang/rust#62964

changelog: none
  • Loading branch information
bors committed Jul 27, 2019
2 parents f8e04ff + d73a953 commit 5441cf2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/needless_pass_by_value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/fmt.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#[test]
#[ignore]
fn fmt() {
if option_env!("RUSTC_TEST_SUITE").is_some() {
return;
Expand Down

0 comments on commit 5441cf2

Please sign in to comment.