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

Auto merge of #4689 - Manishearth:rustup, r=Yaahc

Browse Source 
Rustup to rustc 1.40.0-nightly (fa0f7d008 2019-10-17)

changelog: none
This commit is contained in:
bors 2019-10-17 23:00:08 +00:00
commit e979eb4cc5
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/lib.rs
View File

@ -37,6 +37,8 @@ extern crate rustc_typeck;
#[allow(unused_extern_crates)]
extern crate syntax;
#[allow(unused_extern_crates)]
extern crate syntax_expand;
#[allow(unused_extern_crates)]
extern crate syntax_pos;
use toml;

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
/// generated by `#[derive(...)]` or the like).
fn in_attributes_expansion(expr: &Expr) -> bool {
use syntax::ext::hygiene::MacroKind;
use syntax_expand::hygiene::MacroKind;
if expr.span.from_expansion() {
let data = expr.span.ctxt().outer_expn_data();

4
clippy_lints/src/types.rs
View File

@ -17,10 +17,10 @@ use rustc_target::spec::abi::Abi;
use rustc_typeck::hir_ty_to_ty;
use syntax::ast::{FloatTy, IntTy, LitIntType, LitKind, UintTy};
use syntax::errors::DiagnosticBuilder;
use syntax::ext::base::MacroKind;
use syntax::ext::hygiene::ExpnKind;
use syntax::source_map::Span;
use syntax::symbol::{sym, Symbol};
use syntax_expand::base::MacroKind;
use syntax_expand::hygiene::ExpnKind;
use crate::consts::{constant, Constant};
use crate::utils::paths;

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

@ -43,9 +43,9 @@ use rustc_errors::Applicability;
use smallvec::SmallVec;
use syntax::ast::{self, LitKind};
use syntax::attr;
use syntax::ext::hygiene::ExpnKind;
use syntax::source_map::{Span, DUMMY_SP};
use syntax::symbol::{kw, Symbol};
use syntax_expand::hygiene::ExpnKind;
use crate::consts::{constant, Constant};
use crate::reexport::*;