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

Auto merge of #4747 - matthiaskrgr:rustup_19, r=flip1995

Browse Source 
rustup https://github.com/rust-lang/rust/pull/65792/

changelog: none
This commit is contained in:
bors 2019-10-28 14:26:02 +00:00
commit e93a8f989c
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -63,8 +63,9 @@ matrix:
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 # FIXME blocked on https://github.com/rust-lang/rust-clippy/issues/4742
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) #- env: INTEGRATION=rust-lang/rustfmt
# if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=hyperium/hyper - env: INTEGRATION=hyperium/hyper
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=bluss/rust-itertools - env: INTEGRATION=bluss/rust-itertools

2
clippy_lints/src/lib.rs
View File

@ -37,8 +37,6 @@ extern crate rustc_typeck;
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
extern crate syntax; extern crate syntax;
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
extern crate syntax_expand;
#[allow(unused_extern_crates)]
extern crate syntax_pos; extern crate syntax_pos;
use rustc::lint::{self, LintId}; use rustc::lint::{self, LintId};

2
clippy_lints/src/misc.rs
View File

@ -596,7 +596,7 @@ fn is_used(cx: &LateContext<'_, '_>, expr: &Expr) -> bool {
/// Tests whether an expression is in a macro expansion (e.g., something /// Tests whether an expression is in a macro expansion (e.g., something
/// generated by `#[derive(...)]` or the like). /// generated by `#[derive(...)]` or the like).
fn in_attributes_expansion(expr: &Expr) -> bool { fn in_attributes_expansion(expr: &Expr) -> bool {
use syntax_expand::hygiene::MacroKind; use syntax_pos::hygiene::MacroKind;
if expr.span.from_expansion() { if expr.span.from_expansion() {
let data = expr.span.ctxt().outer_expn_data(); let data = expr.span.ctxt().outer_expn_data();

3
clippy_lints/src/types.rs
View File

@ -19,8 +19,7 @@ use syntax::ast::{FloatTy, IntTy, LitIntType, LitKind, UintTy};
use syntax::errors::DiagnosticBuilder; use syntax::errors::DiagnosticBuilder;
use syntax::source_map::Span; use syntax::source_map::Span;
use syntax::symbol::{sym, Symbol}; use syntax::symbol::{sym, Symbol};
use syntax_expand::base::MacroKind; use syntax_pos::hygiene::{ExpnKind, MacroKind};
use syntax_expand::hygiene::ExpnKind;
use crate::consts::{constant, Constant}; use crate::consts::{constant, Constant};
use crate::utils::paths; use crate::utils::paths;

2
clippy_lints/src/utils/mod.rs
View File

@ -45,7 +45,7 @@ use syntax::ast::{self, LitKind};
use syntax::attr; use syntax::attr;
use syntax::source_map::{Span, DUMMY_SP}; use syntax::source_map::{Span, DUMMY_SP};
use syntax::symbol::{kw, Symbol}; use syntax::symbol::{kw, Symbol};
use syntax_expand::hygiene::ExpnKind; use syntax_pos::hygiene::ExpnKind;
use crate::consts::{constant, Constant}; use crate::consts::{constant, Constant};
use crate::reexport::*; use crate::reexport::*;