OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #4125 - Manishearth:rustup, r=oli-obk

Browse Source 
Rustup to rustc 1.36.0-nightly (dbfe70dfc 2019-05-22)

not 100% sure of the Symbol stuff

r? @oli-obk
This commit is contained in:
bors 2019-05-22 08:37:27 +00:00
commit a8eeb7cdb1
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -51,8 +51,9 @@ 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
- env: INTEGRATION=rust-lang/cargo # disabled cargo integration test due to https://github.com/rust-lang/rust-clippy/issues/4121
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) #- env: INTEGRATION=rust-lang/cargo
# 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

2
clippy_lints/src/enum_variants.rs
View File

@ -248,7 +248,7 @@ impl EarlyLintPass for EnumVariantNames {
if let Some(&(ref mod_name, ref mod_camel)) = self.modules.last() { if let Some(&(ref mod_name, ref mod_camel)) = self.modules.last() {
// constants don't have surrounding modules // constants don't have surrounding modules
if !mod_camel.is_empty() { if !mod_camel.is_empty() {
if *mod_name == item_name { if mod_name.as_symbol() == item.ident.name {
if let ItemKind::Mod(..) = item.node { if let ItemKind::Mod(..) = item.node {
span_lint( span_lint(
cx, cx,

2
clippy_lints/src/format.rs
View File

@ -61,7 +61,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UselessFormat {
then { then {
let (message, sugg) = if_chain! { let (message, sugg) = if_chain! {
if let ExprKind::MethodCall(ref path, _, _) = format_arg.node; if let ExprKind::MethodCall(ref path, _, _) = format_arg.node;
if path.ident.as_interned_str() == "to_string"; if path.ident.as_interned_str().as_symbol() == sym!(to_string);
then { then {
("`to_string()` is enough", ("`to_string()` is enough",
snippet(cx, format_arg.span, "<arg>").to_string()) snippet(cx, format_arg.span, "<arg>").to_string())

4
clippy_lints/src/utils/higher.rs
View File

@ -63,10 +63,10 @@ pub fn range<'a, 'b, 'tcx>(cx: &LateContext<'a, 'tcx>, expr: &'b hir::Expr) -> O
if def_path.data.len() != 3 { if def_path.data.len() != 3 {
return None; return None;
} }
if def_path.data.get(0)?.data.as_interned_str() != "ops" { if def_path.data.get(0)?.data.as_interned_str().as_symbol() != sym!(ops) {
return None; return None;
} }
if def_path.data.get(1)?.data.as_interned_str() != "range" { if def_path.data.get(1)?.data.as_interned_str().as_symbol() != sym!(range) {
return None; return None;
} }
let type_name = def_path.data.get(2)?.data.as_interned_str(); let type_name = def_path.data.get(2)?.data.as_interned_str();