From 7d83e136600259c304495581e8debdfb113fc3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sun, 9 Jun 2019 15:21:28 +0200 Subject: [PATCH 1/2] rustup https://github.com/rust-lang/rust/pull/61669/ --- clippy_lints/src/utils/sugg.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs index d1e4db6264f74..ec79b0616e3b1 100644 --- a/clippy_lints/src/utils/sugg.rs +++ b/clippy_lints/src/utils/sugg.rs @@ -13,7 +13,7 @@ use std::convert::TryInto; 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 @@ pub fn make_assoc(op: AssocOp, lhs: &Sugg<'_>, rhs: &Sugg<'_>) -> Sugg<'static> 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), From abfdceca18bab67403ccbe9c80d855c7bb48bdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sun, 9 Jun 2019 20:53:24 +0200 Subject: [PATCH 2/2] travis: disable rls integration test. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 130a7f1fa6d61..00636525c5bde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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