diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2019-07-06 13:45:21 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2019-07-17 10:48:54 +0200 |
| commit | d3718823ba920db1707ba1d137fcf00ce2f467b1 (patch) | |
| tree | 5ca2a6e62260179d73f54aeb39a464f2d57dfa47 /components/script_plugins/utils.rs | |
| parent | b6bd2d730207870e2ace19c018d0148315fbca7b (diff) | |
| download | servo-d3718823ba920db1707ba1d137fcf00ce2f467b1.tar.gz servo-d3718823ba920db1707ba1d137fcf00ce2f467b1.zip | |
Upgrade to rustc 1.38.0-nightly (4b65a86eb 2019-07-15)
Diffstat (limited to 'components/script_plugins/utils.rs')
| -rw-r--r-- | components/script_plugins/utils.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs index e6398de35e1..0c22f224647 100644 --- a/components/script_plugins/utils.rs +++ b/components/script_plugins/utils.rs @@ -4,7 +4,7 @@ use rustc::hir::def_id::DefId; use rustc::lint::LateContext; -use syntax::source_map::{ExpnFormat, Span}; +use syntax::source_map::{ExpnKind, MacroKind, Span}; use syntax::symbol::Symbol; /// check if a DefId's path matches the given absolute type path @@ -31,7 +31,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool pub fn in_derive_expn(span: Span) -> bool { if let Some(i) = span.ctxt().outer().expn_info() { - if let ExpnFormat::MacroAttribute(n) = i.format { + if let ExpnKind::Macro(MacroKind::Attr, n) = i.kind { n.as_str().contains("derive") } else { false |