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

Upgrade to rustc 1.36.0-nightly (a9ec99f42 2019-05-13)

Browse source
This commit is contained in:
Simon Sapin 2019-05-14 14:39:23 +02:00
parent 3ca9d143af
commit 06b99983fc
5 changed files with 131 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script_plugins/utils.rs
View file

@ -5,11 +5,12 @@
use rustc::hir::def_id::DefId;
use rustc::lint::LateContext;
use syntax::source_map::{ExpnFormat, Span};
use syntax::symbol::Symbol;
/// check if a DefId's path matches the given absolute type path
/// usage e.g. with
/// `match_def_path(cx, id, &["core", "option", "Option"])`
pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool {
let krate = &cx.tcx.crate_name(def_id.krate);
if krate != &path[0] {
return false;
@ -24,9 +25,8 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
other
.into_iter()
.map(|e| e.data)
.zip(path)
.all(|(nm, p)| &*nm.as_interned_str().as_str() == *p)
.all(|(e, p)| e.data.as_interned_str().as_symbol() == *p)
}
pub fn in_derive_expn(span: Span) -> bool {