user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #4188 - matthiaskrgr:rustup_7, r=Manishearth

Browse source 
rustup https://github.com/rust-lang/rust/pull/61669/

changelog: none
This commit is contained in:
bors 2019-06-09 18:59:35 +00:00
commit c0dbd34ba9
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -51,13 +51,13 @@ matrix:
# We don't want to run these always because they go towards # We don't want to run these always because they go towards
# the build limit within the Travis rust-lang account. # the build limit within the Travis rust-lang account.
# The jobs are approximately sorted by execution time # The jobs are approximately sorted by execution time
# disabled cargo integration test due to https://github.com/rust-lang/rust-clippy/issues/4121 # disabled cargo and rls integration test due to https://github.com/rust-lang/rust-clippy/issues/4121
#- env: INTEGRATION=rust-lang/cargo #- env: INTEGRATION=rust-lang/cargo
# if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) # if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang-nursery/chalk - env: INTEGRATION=rust-lang-nursery/chalk
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang/rls #- env: INTEGRATION=rust-lang/rls
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) # if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=Geal/nom - env: INTEGRATION=Geal/nom
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang/rustfmt - env: INTEGRATION=rust-lang/rustfmt

4
clippy_lints/src/utils/sugg.rs
View file

@ -13,7 +13,7 @@ use std::convert::TryInto;
use std::fmt::Display; use std::fmt::Display;
use syntax::ast; use syntax::ast;
use syntax::parse::token; use syntax::parse::token;
use syntax::print::pprust::token_to_string; use syntax::print::pprust::token_kind_to_string;
use syntax::source_map::{CharPos, Span}; use syntax::source_map::{CharPos, Span};
use syntax::util::parser::AssocOp; use syntax::util::parser::AssocOp;
use syntax_pos::{BytePos, Pos}; use syntax_pos::{BytePos, Pos};
@ -384,7 +384,7 @@ pub fn make_assoc(op: AssocOp, lhs: &Sugg<'_>, rhs: &Sugg<'_>) -> Sugg<'static>
rhs rhs
), ),
AssocOp::Assign => format!("{} = {}", lhs, rhs), AssocOp::Assign => format!("{} = {}", lhs, rhs),
AssocOp::AssignOp(op) => format!("{} {}= {}", lhs, token_to_string(&token::BinOp(op)), rhs), AssocOp::AssignOp(op) => format!("{} {}= {}", lhs, token_kind_to_string(&token::BinOp(op)), rhs),
AssocOp::As => format!("{} as {}", lhs, rhs), AssocOp::As => format!("{} as {}", lhs, rhs),
AssocOp::DotDot => format!("{}..{}", lhs, rhs), AssocOp::DotDot => format!("{}..{}", lhs, rhs),
AssocOp::DotDotEq => format!("{}..={}", lhs, rhs), AssocOp::DotDotEq => format!("{}..={}", lhs, rhs),