Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-16 21:15:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 01ab9fe653 abfdceca18
commit c0dbd34ba9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+3 -3
View File
@@ -51,13 +51,13 @@ matrix:
# We don't want to run these always because they go towards
# the build limit within the Travis rust-lang account.
# 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
# if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang-nursery/chalk
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang/rls
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
#- env: INTEGRATION=rust-lang/rls
# if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=Geal/nom
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang/rustfmt
clippy_lints/src/utils/sugg.rs
+2 -2
View File
@@ -13,7 +13,7 @@
use std::fmt::Display;
use syntax::ast;
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::util::parser::AssocOp;
use syntax_pos::{BytePos, Pos};
@@ -384,7 +384,7 @@ fn needs_paren(op: &AssocOp, other: &AssocOp, dir: Associativity) -> bool {
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::DotDot => format!("{}..{}", lhs, rhs),
AssocOp::DotDotEq => format!("{}..={}", lhs, rhs),