Fix warnings post-upgrade

This commit is contained in:
Manish Goregaokar 2014-12-18 15:18:11 +05:30
parent 21a888341d
commit 50c246bdc5
5 changed files with 8 additions and 13 deletions

View file

@ -277,7 +277,7 @@ impl LintPass for InheritancePass {
if match_lang_ty(cx, &*f.node.ty, "reflector") {
if ctr > 0 {
cx.span_lint(INHERITANCE_INTEGRITY, f.span,
"The Reflector should be the first field of the DOM struct");
"The Reflector should be the first field of the DOM struct");
}
return true;
}
@ -287,7 +287,7 @@ impl LintPass for InheritancePass {
// Find all #[dom_struct] fields
let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| {
if let ast::TyPath(_, _, ty_id) = f.node.ty.node {
if let Some(def::DefTy(def_id, _)) = cx.tcx.def_map.borrow().find_copy(&ty_id) {
if let Some(def::DefTy(def_id, _)) = cx.tcx.def_map.borrow().get(&ty_id).cloned() {
if ty::has_attr(cx.tcx, def_id, "_dom_struct_marker") {
// If the field is not the first, it's probably
// being misused (a)
@ -327,7 +327,7 @@ impl LintPass for InheritancePass {
}
} else if dom_spans.len() == 0 {
cx.span_lint(INHERITANCE_INTEGRITY, cx.tcx.map.expect_item(id).span,
"This DOM struct has no reflector or parent DOM struct");
"This DOM struct has no reflector or parent DOM struct");
}
}
}

View file

@ -39,7 +39,7 @@ pub fn match_ty_unwrap<'a>(ty: &'a Ty, segments: &[&str]) -> Option<&'a [P<Ty>]>
pub fn match_lang_ty(cx: &Context, ty: &Ty, value: &str) -> bool {
let mut found = false;
if let TyPath(_, _, ty_id) = ty.node {
if let Some(def::DefTy(def_id, _)) = cx.tcx.def_map.borrow().find_copy(&ty_id) {
if let Some(def::DefTy(def_id, _)) = cx.tcx.def_map.borrow().get(&ty_id).cloned() {
// Iterating through attributes is hard because of cross-crate defs
ty::each_attr(cx.tcx, def_id, |attr| {
if let ast::MetaNameValue(ref name, ref val) = attr.node.value.node {
@ -59,4 +59,4 @@ pub fn match_lang_ty(cx: &Context, ty: &Ty, value: &str) -> bool {
};
}
found
}
}