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

Eliminate warnings

Browse source
This commit is contained in:
Keegan McAllister 2014-09-18 16:29:46 -07:00
parent 2f46b9aede
commit dc86e83654
57 changed files with 223 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/cors.rs
View file

@ -315,7 +315,7 @@ impl CORSCache {
#[allow(dead_code)]
fn clear (&mut self, request: &CORSRequest) {
let CORSCache(buf) = self.clone();
let new_buf: Vec<CORSCacheEntry> = buf.move_iter().filter(|e| e.origin == request.origin && request.destination == e.url).collect();
let new_buf: Vec<CORSCacheEntry> = buf.into_iter().filter(|e| e.origin == request.origin && request.destination == e.url).collect();
*self = CORSCache(new_buf);
}
@ -323,7 +323,7 @@ impl CORSCache {
fn cleanup(&mut self) {
let CORSCache(buf) = self.clone();
let now = time::now().to_timespec();
let new_buf: Vec<CORSCacheEntry> = buf.move_iter().filter(|e| now.sec > e.created.sec + e.max_age as i64).collect();
let new_buf: Vec<CORSCacheEntry> = buf.into_iter().filter(|e| now.sec > e.created.sec + e.max_age as i64).collect();
*self = CORSCache(new_buf);
}
@ -332,7 +332,7 @@ impl CORSCache {
self.cleanup();
let CORSCache(ref mut buf) = *self;
// Credentials are not yet implemented here
let entry = buf.mut_iter().find(|e| e.origin.scheme == request.origin.scheme &&
let entry = buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
e.origin.host() == request.origin.host() &&
e.origin.port() == request.origin.port() &&
e.url == request.destination &&
@ -353,7 +353,7 @@ impl CORSCache {
self.cleanup();
let CORSCache(ref mut buf) = *self;
// Credentials are not yet implemented here
let entry = buf.mut_iter().find(|e| e.origin.scheme == request.origin.scheme &&
let entry = buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
e.origin.host() == request.origin.host() &&
e.origin.port() == request.origin.port() &&
e.url == request.destination &&

10
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1798,7 +1798,7 @@ let obj = with_compartment(aCx, proto, || {
NewProxyObject(aCx, handler,
&private,
proto, %s,
ptr::mut_null(), ptr::mut_null())
ptr::null_mut(), ptr::null_mut())
});
assert!(obj.is_not_null());
@ -3666,7 +3666,7 @@ if expando.is_not_null() {
}
}
""" + namedGet + """
(*desc).obj = ptr::mut_null();
(*desc).obj = ptr::null_mut();
return true;"""
def definition_body(self):
@ -4303,11 +4303,11 @@ class CGDictionary(CGThing):
return string.Template(
"impl<'a, 'b> ${selfName}<'a, 'b> {\n"
" pub fn empty() -> ${selfName}<'a, 'b> {\n"
" ${selfName}::new(ptr::mut_null(), NullValue()).unwrap()\n"
" ${selfName}::new(ptr::null_mut(), NullValue()).unwrap()\n"
" }\n"
" pub fn new(cx: *mut JSContext, val: JSVal) -> Result<${selfName}<'a, 'b>, ()> {\n"
" let object = if val.is_null_or_undefined() {\n"
" ptr::mut_null()\n"
" ptr::null_mut()\n"
" } else if val.is_object() {\n"
" val.to_object()\n"
" } else {\n"
@ -4914,7 +4914,7 @@ class CGCallback(CGClass):
# the private method.
argnames = [arg.name for arg in args]
argnamesWithThis = ["s.GetContext()", "thisObjJS"] + argnames
argnamesWithoutThis = ["s.GetContext()", "ptr::mut_null()"] + argnames
argnamesWithoutThis = ["s.GetContext()", "ptr::null_mut()"] + argnames
# Now that we've recorded the argnames for our call to our private
# method, insert our optional argument for deciding whether the
# CallSetup should re-throw exceptions on aRv.

2
components/script/dom/bindings/utils.rs
View file

@ -660,7 +660,7 @@ pub extern fn outerize_global(_cx: *mut JSContext, obj: JSHandleObject) -> *mut
IDLInterface::get_prototype_depth(None::<window::Window>))
.unwrap()
.root();
win.deref().browser_context.deref().borrow().get_ref().window_proxy()
win.deref().browser_context.deref().borrow().as_ref().unwrap().window_proxy()
}
}

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

@ -53,11 +53,11 @@ impl BrowserContext {
let page = win.deref().page();
let js_info = page.js_info();
let handler = js_info.get_ref().dom_static.windowproxy_handler;
let handler = js_info.as_ref().unwrap().dom_static.windowproxy_handler;
assert!(handler.deref().is_not_null());
let parent = win.deref().reflector().get_jsobject();
let cx = js_info.get_ref().js_context.deref().deref().ptr;
let cx = js_info.as_ref().unwrap().js_context.deref().deref().ptr;
let wrapper = with_compartment(cx, parent, || unsafe {
WrapperNew(cx, parent, *handler.deref())
});

30
components/script/dom/document.rs
View file

@ -356,12 +356,14 @@ impl<'a> PrivateDocumentHelpers for JSRef<'a, Document> {
}
fn get_html_element(self) -> Option<Temporary<HTMLHtmlElement>> {
self.GetDocumentElement().root().filtered(|root| {
let root: JSRef<Node> = NodeCast::from_ref(**root);
root.type_id() == ElementNodeTypeId(HTMLHtmlElementTypeId)
}).map(|elem| {
Temporary::from_rooted(HTMLHtmlElementCast::to_ref(*elem).unwrap())
})
match self.GetDocumentElement().root() {
Some(ref root) if {
let root: JSRef<Node> = NodeCast::from_ref(**root);
root.type_id() == ElementNodeTypeId(HTMLHtmlElementTypeId)
} => Some(Temporary::from_rooted(HTMLHtmlElementCast::to_ref(**root).unwrap())),
_ => None,
}
}
}
@ -371,7 +373,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
if self.implementation.get().is_none() {
self.implementation.assign(Some(DOMImplementation::new(self)));
}
Temporary::new(self.implementation.get().get_ref().clone())
Temporary::new(self.implementation.get().as_ref().unwrap().clone())
}
// http://dom.spec.whatwg.org/#dom-document-url
@ -751,7 +753,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let filter = box ImagesFilter;
self.images.assign(Some(HTMLCollection::create(*window, root, filter)));
}
Temporary::new(self.images.get().get_ref().clone())
Temporary::new(self.images.get().as_ref().unwrap().clone())
}
fn Embeds(self) -> Temporary<HTMLCollection> {
@ -761,7 +763,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let filter = box EmbedsFilter;
self.embeds.assign(Some(HTMLCollection::create(*window, root, filter)));
}
Temporary::new(self.embeds.get().get_ref().clone())
Temporary::new(self.embeds.get().as_ref().unwrap().clone())
}
fn Plugins(self) -> Temporary<HTMLCollection> {
@ -775,7 +777,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let filter = box LinksFilter;
self.links.assign(Some(HTMLCollection::create(*window, root, filter)));
}
Temporary::new(self.links.get().get_ref().clone())
Temporary::new(self.links.get().as_ref().unwrap().clone())
}
fn Forms(self) -> Temporary<HTMLCollection> {
@ -785,7 +787,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let filter = box FormsFilter;
self.forms.assign(Some(HTMLCollection::create(*window, root, filter)));
}
Temporary::new(self.forms.get().get_ref().clone())
Temporary::new(self.forms.get().as_ref().unwrap().clone())
}
fn Scripts(self) -> Temporary<HTMLCollection> {
@ -795,7 +797,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let filter = box ScriptsFilter;
self.scripts.assign(Some(HTMLCollection::create(*window, root, filter)));
}
Temporary::new(self.scripts.get().get_ref().clone())
Temporary::new(self.scripts.get().as_ref().unwrap().clone())
}
fn Anchors(self) -> Temporary<HTMLCollection> {
@ -805,7 +807,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let filter = box AnchorsFilter;
self.anchors.assign(Some(HTMLCollection::create(*window, root, filter)));
}
Temporary::new(self.anchors.get().get_ref().clone())
Temporary::new(self.anchors.get().as_ref().unwrap().clone())
}
fn Applets(self) -> Temporary<HTMLCollection> {
@ -816,7 +818,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let filter = box AppletsFilter;
self.applets.assign(Some(HTMLCollection::create(*window, root, filter)));
}
Temporary::new(self.applets.get().get_ref().clone())
Temporary::new(self.applets.get().as_ref().unwrap().clone())
}
fn Location(self) -> Temporary<Location> {

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

@ -581,7 +581,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
let window = doc.deref().window.root();
let list = NamedNodeMap::new(*window, self);
self.attr_list.assign(Some(list));
Temporary::new(self.attr_list.get().get_ref().clone())
Temporary::new(self.attr_list.get().as_ref().unwrap().clone())
}
// http://dom.spec.whatwg.org/#dom-element-getattribute

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

@ -254,7 +254,7 @@ impl<'a> EventTargetMethods for JSRef<'a, EventTarget> {
Some(listener) => {
let mut handlers = self.handlers.deref().borrow_mut();
let mut entry = handlers.find_mut(&ty);
for entry in entry.mut_iter() {
for entry in entry.iter_mut() {
let phase = if capture { Capturing } else { Bubbling };
let old_entry = EventListenerEntry {
phase: phase,

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

@ -73,7 +73,7 @@ impl<'a> FormDataMethods for JSRef<'a, FormData> {
fn Get(self, name: DOMString) -> Option<FileOrString> {
if self.data.deref().borrow().contains_key_equiv(&name) {
match self.data.deref().borrow().get(&name)[0].clone() {
match (*self.data.deref().borrow())[name][0].clone() {
StringData(ref s) => Some(eString(s.clone())),
FileData(ref f) => {
Some(eFile(f.clone()))

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

@ -657,7 +657,7 @@ impl<'m, 'n> NodeHelpers<'m, 'n> for JSRef<'n, Node> {
}
fn owner_doc(&self) -> Temporary<Document> {
Temporary::new(self.owner_doc.get().get_ref().clone())
Temporary::new(self.owner_doc.get().as_ref().unwrap().clone())
}
fn set_owner_doc(&self, document: JSRef<Document>) {
@ -869,7 +869,7 @@ impl<'a> Iterator<JSRef<'a, Node>> for AncestorIterator<'a> {
}
// FIXME: Do we need two clones here?
let x = self.current.get_ref().clone();
let x = self.current.as_ref().unwrap().clone();
self.current = x.parent_node().map(|node| (*node.root()).clone());
Some(x)
}
@ -1236,7 +1236,7 @@ impl Node {
// Step 7: mutation records.
// Step 8.
for node in nodes.mut_iter() {
for node in nodes.iter_mut() {
parent.add_child(*node, child);
let is_in_doc = parent.is_in_doc();
for kid in node.traverse_preorder() {
@ -1571,7 +1571,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
let window = doc.deref().window.root();
let child_list = NodeList::new_child_list(*window, self);
self.child_list.assign(Some(child_list));
Temporary::new(self.child_list.get().get_ref().clone())
Temporary::new(self.child_list.get().as_ref().unwrap().clone())
}
// http://dom.spec.whatwg.org/#dom-node-firstchild

16
components/script/dom/window.rs
View file

@ -98,7 +98,7 @@ pub struct Window {
impl Window {
pub fn get_cx(&self) -> *mut JSContext {
let js_info = self.page().js_info();
(**js_info.get_ref().js_context).ptr
(**js_info.as_ref().unwrap().js_context).ptr
}
pub fn page<'a>(&'a self) -> &'a Page {
@ -112,7 +112,7 @@ impl Window {
#[unsafe_destructor]
impl Drop for Window {
fn drop(&mut self) {
for (_, timer_handle) in self.active_timers.borrow_mut().mut_iter() {
for (_, timer_handle) in self.active_timers.borrow_mut().iter_mut() {
timer_handle.cancel();
}
}
@ -215,7 +215,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
fn Document(self) -> Temporary<Document> {
let frame = self.page().frame();
Temporary::new(frame.get_ref().document.clone())
Temporary::new(frame.as_ref().unwrap().document.clone())
}
fn Location(self) -> Temporary<Location> {
@ -224,7 +224,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
let location = Location::new(self, page);
self.location.assign(Some(location));
}
Temporary::new(self.location.get().get_ref().clone())
Temporary::new(self.location.get().as_ref().unwrap().clone())
}
fn Console(self) -> Temporary<Console> {
@ -232,7 +232,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
let console = Console::new(&global::Window(self));
self.console.assign(Some(console));
}
Temporary::new(self.console.get().get_ref().clone())
Temporary::new(self.console.get().as_ref().unwrap().clone())
}
fn Navigator(self) -> Temporary<Navigator> {
@ -240,7 +240,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
let navigator = Navigator::new(self);
self.navigator.assign(Some(navigator));
}
Temporary::new(self.navigator.get().get_ref().clone())
Temporary::new(self.navigator.get().as_ref().unwrap().clone())
}
fn SetTimeout(self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32 {
@ -288,7 +288,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
let performance = Performance::new(self);
self.performance.assign(Some(performance));
}
Temporary::new(self.performance.get().get_ref().clone())
Temporary::new(self.performance.get().as_ref().unwrap().clone())
}
fn GetOnclick(self) -> Option<EventHandlerNonNull> {
@ -336,7 +336,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
let screen = Screen::new(self);
self.screen.assign(Some(screen));
}
Temporary::new(self.screen.get().get_ref().clone())
Temporary::new(self.screen.get().as_ref().unwrap().clone())
}
fn Debug(self, message: DOMString) {

10
components/script/dom/workerglobalscope.rs
View file

@ -88,12 +88,12 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
let location = WorkerLocation::new(self, self.worker_url.deref().clone());
self.location.assign(Some(location));
}
Temporary::new(self.location.get().get_ref().clone())
Temporary::new(self.location.get().as_ref().unwrap().clone())
}
fn ImportScripts(self, url_strings: Vec<DOMString>) -> ErrorResult {
let mut urls = Vec::with_capacity(url_strings.len());
for url in url_strings.move_iter() {
for url in url_strings.into_iter() {
let url = UrlParser::new().base_url(&*self.worker_url)
.parse(url.as_slice());
match url {
@ -102,7 +102,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
};
}
for url in urls.move_iter() {
for url in urls.into_iter() {
let (url, source) = match load_whole_resource(&*self.resource_task, url) {
Err(_) => return Err(Network),
Ok((metadata, bytes)) => {
@ -128,7 +128,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
let navigator = WorkerNavigator::new(self);
self.navigator.assign(Some(navigator));
}
Temporary::new(self.navigator.get().get_ref().clone())
Temporary::new(self.navigator.get().as_ref().unwrap().clone())
}
fn Console(self) -> Temporary<Console> {
@ -136,7 +136,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
let console = Console::new(&global::Worker(self));
self.console.assign(Some(console));
}
Temporary::new(self.console.get().get_ref().clone())
Temporary::new(self.console.get().as_ref().unwrap().clone())
}
fn Btoa(self, btoa: DOMString) -> Fallible<DOMString> {

2
components/script/html/hubbub_html_parser.rs
View file

@ -519,7 +519,7 @@ pub fn parse_html(page: &Page,
let load_response = load_response.unwrap();
match load_response.metadata.content_type {
Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => {
let page = format!("<html><body><img src='{:s}' /></body></html>", base_url.get_ref().serialize());
let page = format!("<html><body><img src='{:s}' /></body></html>", base_url.as_ref().unwrap().serialize());
parser.parse_chunk(page.into_bytes().as_slice());
},
_ => loop {

2
components/script/lib.rs
View file

@ -8,7 +8,7 @@
#![feature(globs, macro_rules, struct_variant, phase, unsafe_destructor)]
#![deny(unused_imports, unused_variable)]
#![allow(non_snake_case_functions)]
#![allow(non_snake_case)]
#![doc="The script crate contains all matters DOM."]

14
components/script/page.rs
View file

@ -169,7 +169,7 @@ impl Page {
let damaged = self.damage.borrow().is_some();
if damaged {
let frame = self.frame();
let window = frame.get_ref().window.root();
let window = frame.as_ref().unwrap().window.root();
self.reflow(goal, window.control_chan.clone(), &**window.compositor);
} else {
self.avoided_reflows.set(self.avoided_reflows.get() + 1);
@ -192,7 +192,7 @@ impl Page {
self.children
.deref()
.borrow_mut()
.mut_iter()
.iter_mut()
.enumerate()
.find(|&(_idx, ref page_tree)| {
// FIXME: page_tree has a lifetime such that it's unusable for anything.
@ -204,7 +204,7 @@ impl Page {
match remove_idx {
Some(idx) => return Some(self.children.deref().borrow_mut().remove(idx).unwrap()),
None => {
for page_tree in self.children.deref().borrow_mut().mut_iter() {
for page_tree in self.children.deref().borrow_mut().iter_mut() {
match page_tree.remove(id) {
found @ Some(_) => return found,
None => (), // keep going...
@ -292,7 +292,7 @@ impl Page {
}
pub fn get_url(&self) -> Url {
self.url().get_ref().ref0().clone()
self.url().as_ref().unwrap().ref0().clone()
}
// FIXME(cgaebel): join_layout is racey. What if the compositor triggers a
@ -393,7 +393,7 @@ impl Page {
/// Attempt to find a named element in this page's document.
pub fn find_fragment_node(&self, fragid: DOMString) -> Option<Temporary<Element>> {
let document = self.frame().get_ref().document.root();
let document = self.frame().as_ref().unwrap().document.root();
match document.deref().GetElementById(fragid.to_string()) {
Some(node) => Some(node),
None => {
@ -412,7 +412,7 @@ impl Page {
pub fn hit_test(&self, point: &Point2D<f32>) -> Option<UntrustedNodeAddress> {
let frame = self.frame();
let document = frame.get_ref().document.root();
let document = frame.as_ref().unwrap().document.root();
let root = document.deref().GetDocumentElement().root();
if root.is_none() {
return None;
@ -433,7 +433,7 @@ impl Page {
pub fn get_nodes_under_mouse(&self, point: &Point2D<f32>) -> Option<Vec<UntrustedNodeAddress>> {
let frame = self.frame();
let document = frame.get_ref().document.root();
let document = frame.as_ref().unwrap().document.root();
let root = document.deref().GetDocumentElement().root();
if root.is_none() {
return None;

16
components/script/script_task.rs
View file

@ -376,7 +376,7 @@ impl ScriptTask {
}
pub fn get_cx(&self) -> *mut JSContext {
(**self.js_context.borrow().get_ref()).ptr
(**self.js_context.borrow().as_ref().unwrap()).ptr
}
/// Starts the script task. After calling this method, the script task will loop receiving
@ -412,7 +412,7 @@ impl ScriptTask {
}
}
for (id, size) in resizes.move_iter() {
for (id, size) in resizes.into_iter() {
self.handle_event(id, ResizeEvent(size));
}
@ -485,7 +485,7 @@ impl ScriptTask {
}
// Process the gathered events.
for msg in sequential.move_iter() {
for msg in sequential.into_iter() {
match msg {
// TODO(tkuehn) need to handle auxiliary layouts for iframes
FromConstellation(AttachLayoutMsg(_)) => fail!("should have handled AttachLayoutMsg already"),
@ -605,7 +605,7 @@ impl ScriptTask {
window_size,
parent_page.resource_task.deref().clone(),
self.constellation_chan.clone(),
self.js_context.borrow().get_ref().clone())
self.js_context.borrow().as_ref().unwrap().clone())
};
parent_page.children.deref().borrow_mut().push(Rc::new(new_page));
}
@ -616,7 +616,7 @@ impl ScriptTask {
let page = page.find(id).expect("ScriptTask: received fire timer msg for a
pipeline ID not associated with this script task. This is a bug.");
let frame = page.frame();
let window = frame.get_ref().window.root();
let window = frame.as_ref().unwrap().window.root();
window.handle_fire_timer(timer_id, self.get_cx());
}
@ -729,7 +729,7 @@ impl ScriptTask {
let last_url = last_loaded_url.map(|(ref loaded, _)| loaded.clone());
let cx = self.js_context.borrow();
let cx = cx.get_ref();
let cx = cx.as_ref().unwrap();
// Create the window and document objects.
let window = Window::new(cx.deref().ptr,
page.clone(),
@ -742,7 +742,7 @@ impl ScriptTask {
Some(url) => Some(url.clone()),
None => Url::parse("about:blank").ok(),
};
*page.mut_url() = Some((doc_url.get_ref().clone(), true));
*page.mut_url() = Some((doc_url.as_ref().unwrap().clone(), true));
doc_url
} else {
Some(url.clone())
@ -974,7 +974,7 @@ impl ScriptTask {
let mouse_over_targets = &mut *self.mouse_over_targets.borrow_mut();
match *mouse_over_targets {
Some(ref mut mouse_over_targets) => {
for node in mouse_over_targets.mut_iter() {
for node in mouse_over_targets.iter_mut() {
let node = node.root();
node.deref().set_hover_state(false);
}