diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-03-31 15:09:04 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-03-31 15:09:04 +0200 |
| commit | de01c5989173b5e4a1fe320a10d4bcfb4609ce99 (patch) | |
| tree | c19f3faf5a9d86c2f7e83f8007f3f15d069b3f09 | |
| parent | 955d3a8b8746b5060d421253263cf9bb05808866 (diff) | |
| download | servo-de01c5989173b5e4a1fe320a10d4bcfb4609ce99.tar.gz servo-de01c5989173b5e4a1fe320a10d4bcfb4609ce99.zip | |
Upgrade to rustc 1.18.0-nightly (474f7a91e 2017-03-31)
| -rw-r--r-- | components/script_plugins/unrooted_must_root.rs | 2 | ||||
| -rw-r--r-- | components/script_plugins/utils.rs | 23 | ||||
| -rw-r--r-- | rust-commit-hash | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index c62796b7a90..d869211315e 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -138,7 +138,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { visit::FnKind::Closure(_) => return, }; - if !in_derive_expn(cx, span) { + if !in_derive_expn(span) { let def_id = cx.tcx.hir.local_def_id(id); let ty = cx.tcx.item_type(def_id); diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs index 3c768a51ae2..4f6fce2d0ed 100644 --- a/components/script_plugins/utils.rs +++ b/components/script_plugins/utils.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use rustc::hir::def_id::DefId; -use rustc::lint::{LateContext, LintContext}; +use rustc::lint::LateContext; use syntax::codemap::{ExpnFormat, Span}; /// check if a DefId's path matches the given absolute type path @@ -28,15 +28,14 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool { .all(|(nm, p)| &*nm.as_interned_str() == *p) } -pub fn in_derive_expn(cx: &LateContext, span: Span) -> bool { - cx.sess().codemap().with_expn_info(span.expn_id, - |info| { - if let Some(i) = info { - if let ExpnFormat::MacroAttribute(n) = i.callee.format { - if n.as_str().contains("derive") { - true - } else { false } - } else { false } - } else { false } - }) +pub fn in_derive_expn(span: Span) -> bool { + if let Some(i) = span.ctxt.outer().expn_info() { + if let ExpnFormat::MacroAttribute(n) = i.callee.format { + n.as_str().contains("derive") + } else { + false + } + } else { + false + } } diff --git a/rust-commit-hash b/rust-commit-hash index 4c7e4c21746..c7e14fa6268 100644 --- a/rust-commit-hash +++ b/rust-commit-hash @@ -1 +1 @@ -cf69238b82661f5fcb6488e31ef27977f5d2cb81 +474f7a91eec8cba83b7eb7a578a7adb70614f877 |