Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 02:44:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.18.0-nightly (474f7a91e 2017-03-31)

Browse source
This commit is contained in:
Simon Sapin 2017-03-31 15:09:04 +02:00
parent 955d3a8b87
commit de01c59891
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script_plugins/utils.rs
View file

@ -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
}
}