Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01: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

14
components/script_plugins/webidl_must_inherit.rs
View file

@ -23,7 +23,9 @@ declare_lint!(
"Warn and report usage of incorrect webidl inheritance"
);
pub struct WebIdlPass;
pub(crate) struct WebIdlPass {
symbols: crate::Symbols,
}
#[derive(Clone, Debug)]
pub struct ParentMismatchError {
@ -53,8 +55,8 @@ impl Error for ParentMismatchError {
}
impl WebIdlPass {
pub fn new() -> WebIdlPass {
WebIdlPass
pub fn new(symbols: crate::Symbols) -> WebIdlPass {
WebIdlPass { symbols }
}
}
@ -74,12 +76,12 @@ fn get_webidl_path(struct_name: &str) -> io::Result<path::PathBuf> {
Ok(dir)
}
fn is_webidl_ty(cx: &LateContext, ty: &ty::TyS) -> bool {
fn is_webidl_ty(symbols: &crate::Symbols, cx: &LateContext, ty: &ty::TyS) -> bool {
let mut ret = false;
ty.maybe_walk(|t| {
match t.sty {
ty::Adt(did, _substs) => {
if cx.tcx.has_attr(did.did, "webidl") {
if cx.tcx.has_attr(did.did, symbols.webidl) {
ret = true;
}
false
@ -156,7 +158,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for WebIdlPass {
id: HirId,
) {
let def_id = cx.tcx.hir().local_def_id_from_hir_id(id);
if !is_webidl_ty(cx, cx.tcx.type_of(def_id)) {
if !is_webidl_ty(&self.symbols, cx, cx.tcx.type_of(def_id)) {
return;
}