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

Fix warnings post-upgrade

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
components/plugins/lints.rs
View file

@ -287,7 +287,7 @@ impl LintPass for InheritancePass {
// Find all #[dom_struct] fields // Find all #[dom_struct] fields
let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| { let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| {
if let ast::TyPath(_, _, ty_id) = f.node.ty.node { 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 ty::has_attr(cx.tcx, def_id, "_dom_struct_marker") {
// If the field is not the first, it's probably // If the field is not the first, it's probably
// being misused (a) // being misused (a)

2
components/plugins/utils.rs
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 { pub fn match_lang_ty(cx: &Context, ty: &Ty, value: &str) -> bool {
let mut found = false; let mut found = false;
if let TyPath(_, _, ty_id) = ty.node { 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 // Iterating through attributes is hard because of cross-crate defs
ty::each_attr(cx.tcx, def_id, |attr| { ty::each_attr(cx.tcx, def_id, |attr| {
if let ast::MetaNameValue(ref name, ref val) = attr.node.value.node { if let ast::MetaNameValue(ref name, ref val) = attr.node.value.node {

2
components/script/dom/browsercontext.rs
View file

@ -65,6 +65,8 @@ impl BrowserContext {
} }
} }
// This isn't a DOM struct, just a convenience struct
// without a reflector, so we don't mark this as #[dom_struct]
#[must_root] #[must_root]
#[privatize] #[privatize]
#[jstraceable] #[jstraceable]

8
components/script/dom/cssstyledeclaration.rs
View file

@ -7,7 +7,7 @@ use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast};
use dom::bindings::error::ErrorResult; use dom::bindings::error::ErrorResult;
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, JSRef, OptionalRootedRootable, Temporary}; use dom::bindings::js::{JS, JSRef, OptionalRootedRootable, Temporary};
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::document::DocumentHelpers; use dom::document::DocumentHelpers;
use dom::element::{Element, ElementHelpers, StylePriority}; use dom::element::{Element, ElementHelpers, StylePriority};
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
@ -412,9 +412,3 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> {
[ZIndex, SetZIndex, "z-index"] [ZIndex, SetZIndex, "z-index"]
) )
} }
impl Reflectable for CSSStyleDeclaration {
fn reflector<'a>(&'a self) -> &'a Reflector {
&self.reflector_
}
}

1
components/script/dom/node.rs
View file

@ -27,7 +27,6 @@ use dom::bindings::js::{JS, JSRef, RootedReference, Temporary, Root};
use dom::bindings::js::{OptionalSettable, TemporaryPushable, OptionalRootedRootable}; use dom::bindings::js::{OptionalSettable, TemporaryPushable, OptionalRootedRootable};
use dom::bindings::js::{ResultRootable, OptionalRootable, MutNullableJS}; use dom::bindings::js::{ResultRootable, OptionalRootable, MutNullableJS};
use dom::bindings::trace::JSTraceable; use dom::bindings::trace::JSTraceable;
use dom::bindings::utils;
use dom::bindings::utils::{Reflectable, reflect_dom_object}; use dom::bindings::utils::{Reflectable, reflect_dom_object};
use dom::characterdata::CharacterData; use dom::characterdata::CharacterData;
use dom::comment::Comment; use dom::comment::Comment;