diff options
32 files changed, 76 insertions, 78 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 8721b6d1090..9a561b6b7fa 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -401,7 +401,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { (Msg::AssignPaintedBuffers(pipeline_id, epoch, replies, frame_tree_id), ShutdownState::NotShuttingDown) => { - for (layer_id, new_layer_buffer_set) in replies.into_iter() { + for (layer_id, new_layer_buffer_set) in replies { self.assign_painted_buffers(pipeline_id, layer_id, new_layer_buffer_set, @@ -1033,7 +1033,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { fn process_pending_scroll_events(&mut self) { let had_scroll_events = self.pending_scroll_events.len() > 0; for scroll_event in std_mem::replace(&mut self.pending_scroll_events, - Vec::new()).into_iter() { + Vec::new()) { let delta = scroll_event.delta / self.scene.scale; let cursor = scroll_event.cursor.as_f32() / self.scene.scale; @@ -1073,7 +1073,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { .unwrap() .push((extra_layer_data.id, visible_rect)); - for kid in layer.children.borrow().iter() { + for kid in &*layer.children.borrow() { process_layer(&*kid, window_size, new_display_ports) } } @@ -1246,7 +1246,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { let scale = self.device_pixels_per_page_px(); let mut results: HashMap<PipelineId, Vec<PaintRequest>> = HashMap::new(); - for (layer, mut layer_requests) in requests.into_iter() { + for (layer, mut layer_requests) in requests { let pipeline_id = layer.pipeline_id(); let current_epoch = self.pipeline_details.get(&pipeline_id).unwrap().current_epoch; layer.extra_data.borrow_mut().requested_epoch = current_epoch; @@ -1293,7 +1293,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { pipeline.script_chan.send(ConstellationControlMsg::Viewport(pipeline.id.clone(), layer_rect)).unwrap(); } - for kid in layer.children().iter() { + for kid in &*layer.children() { self.send_viewport_rect_for_layer(kid.clone()); } } @@ -1329,7 +1329,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { let pipeline_requests = self.convert_buffer_requests_to_pipeline_requests_map(layers_and_requests); - for (pipeline_id, requests) in pipeline_requests.into_iter() { + for (pipeline_id, requests) in pipeline_requests { let msg = ChromeToPaintMsg::Paint(requests, self.frame_tree_id); let _ = self.get_pipeline(pipeline_id).chrome_to_paint_chan.send(msg); } @@ -1357,7 +1357,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { return true; } - for child in layer.children().iter() { + for child in &*layer.children() { if self.does_layer_have_outstanding_paint_messages(child) { return true; } @@ -1659,7 +1659,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { *layer.bounds.borrow(), *layer.masks_to_bounds.borrow(), layer.establishes_3d_context); - for kid in layer.children().iter() { + for kid in &*layer.children() { self.dump_layer_tree_with_indent(&**kid, level + 1) } } @@ -1674,7 +1674,7 @@ fn find_layer_with_pipeline_and_layer_id_for_layer(layer: Rc<Layer<CompositorDat return Some(layer); } - for kid in layer.children().iter() { + for kid in &*layer.children() { let result = find_layer_with_pipeline_and_layer_id_for_layer(kid.clone(), pipeline_id, layer_id); @@ -1708,7 +1708,7 @@ impl<Window> CompositorEventListener for IOCompositor<Window> where Window: Wind } // Handle any messages coming from the windowing system. - for message in messages.into_iter() { + for message in messages { self.handle_window_message(message); } diff --git a/components/compositing/compositor_layer.rs b/components/compositing/compositor_layer.rs index 080000d270f..82297f6f8fd 100644 --- a/components/compositing/compositor_layer.rs +++ b/components/compositing/compositor_layer.rs @@ -250,7 +250,7 @@ impl CompositorLayer for Layer<CompositorData> { compositor: &mut IOCompositor<Window>) where Window: WindowMethods { self.clear(compositor); - for kid in self.children().iter() { + for kid in &*self.children() { kid.clear_all_tiles(compositor); } } @@ -273,7 +273,7 @@ impl CompositorLayer for Layer<CompositorData> { } None => { // Wasn't found, recurse into child layers - for kid in self.children().iter() { + for kid in &*self.children() { kid.remove_root_layer_with_pipeline_id(compositor, pipeline_id); } } @@ -288,7 +288,7 @@ impl CompositorLayer for Layer<CompositorData> { // Traverse children first so that layers are removed // bottom up - allowing each layer being removed to properly // clean up any tiles it owns. - for kid in self.children().iter() { + for kid in &*self.children() { kid.collect_old_layers(compositor, pipeline_id, new_layers); } @@ -324,12 +324,12 @@ impl CompositorLayer for Layer<CompositorData> { /// This is used during shutdown, when we know the paint task is going away. fn forget_all_tiles(&self) { let tiles = self.collect_buffers(); - for tile in tiles.into_iter() { + for tile in tiles { let mut tile = tile; tile.mark_wont_leak() } - for kid in self.children().iter() { + for kid in &*self.children() { kid.forget_all_tiles(); } } @@ -341,7 +341,7 @@ impl CompositorLayer for Layer<CompositorData> { // Allow children to scroll. let scroll_offset = self.extra_data.borrow().scroll_offset; let new_cursor = cursor - scroll_offset; - for child in self.children().iter() { + for child in &*self.children() { let child_bounds = child.bounds.borrow(); if child_bounds.contains(&new_cursor) { let result = child.handle_scroll_event(delta, new_cursor - child_bounds.origin); @@ -378,7 +378,7 @@ impl CompositorLayer for Layer<CompositorData> { self.extra_data.borrow_mut().scroll_offset = new_offset; let mut result = false; - for child in self.children().iter() { + for child in &*self.children() { result |= child.scroll_layer_and_all_child_layers(new_offset); } @@ -429,7 +429,7 @@ impl CompositorLayer for Layer<CompositorData> { } let offset_for_children = new_offset + self.extra_data.borrow().scroll_offset; - for child in self.children().iter() { + for child in &*self.children() { result |= child.scroll_layer_and_all_child_layers(offset_for_children); } diff --git a/components/compositing/surface_map.rs b/components/compositing/surface_map.rs index 76bf729d9e5..190ae536684 100644 --- a/components/compositing/surface_map.rs +++ b/components/compositing/surface_map.rs @@ -69,7 +69,7 @@ impl SurfaceMap { } pub fn insert_surfaces(&mut self, display: &NativeDisplay, surfaces: Vec<NativeSurface>) { - for surface in surfaces.into_iter() { + for surface in surfaces { self.insert(display, surface); } } diff --git a/components/devtools/actor.rs b/components/devtools/actor.rs index 5a290672c6b..8cc9a2231ed 100644 --- a/components/devtools/actor.rs +++ b/components/devtools/actor.rs @@ -150,7 +150,7 @@ impl ActorRegistry { } pub fn actor_to_script(&self, actor: String) -> String { - for (key, value) in self.script_actors.borrow().iter() { + for (key, value) in &*self.script_actors.borrow() { println!("checking {}", value); if *value == actor { return key.to_string(); @@ -213,7 +213,7 @@ impl ActorRegistry { } let old_actors = replace(&mut *self.old_actors.borrow_mut(), vec!()); - for name in old_actors.into_iter() { + for name in old_actors { self.drop_actor(name); } Ok(()) diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index bc1d09c7a14..e6d10abc313 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -297,7 +297,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>, columnNumber: console_message.columnNumber, }, }; - for stream in console_actor.streams.borrow_mut().iter_mut() { + for mut stream in &mut *console_actor.streams.borrow_mut() { stream.write_json_packet(&msg); } } diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 4b6286aa998..f7478f91cc8 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -340,7 +340,7 @@ impl StackingContext { } // Step 3: Positioned descendants with negative z-indices. - for positioned_kid in positioned_children.iter() { + for positioned_kid in &*positioned_children { if positioned_kid.z_index >= 0 { break } @@ -382,7 +382,7 @@ impl StackingContext { } // Step 9: Positioned descendants with nonnegative, numeric z-indices. - for positioned_kid in positioned_children.iter() { + for positioned_kid in &*positioned_children { if positioned_kid.z_index < 0 { continue } @@ -554,12 +554,12 @@ impl StackingContext { // borders. // // TODO(pcwalton): Step 6: Inlines that generate stacking contexts. - for display_list in [ + for display_list in &[ &self.display_list.positioned_content, &self.display_list.content, &self.display_list.floats, &self.display_list.block_backgrounds_and_borders, - ].iter() { + ] { hit_test_in_list(point, result, topmost_only, display_list.iter().rev()); if topmost_only && !result.is_empty() { return @@ -614,7 +614,7 @@ pub fn find_stacking_context_with_layer_id(this: &Arc<StackingContext>, layer_id Some(_) | None => {} } - for kid in this.display_list.children.iter() { + for kid in &this.display_list.children { match find_stacking_context_with_layer_id(kid, layer_id) { Some(stacking_context) => return Some(stacking_context), None => {} @@ -755,7 +755,7 @@ impl ClippingRegion { #[inline] pub fn bounding_rect(&self) -> Rect<Au> { let mut rect = self.main; - for complex in self.complex.iter() { + for complex in &*self.complex { rect = rect.union(&complex.rect) } rect diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs index 37edd843ebb..175a7b040f1 100644 --- a/components/gfx/paint_task.rs +++ b/components/gfx/paint_task.rs @@ -233,7 +233,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send + 'static { let mut replies = Vec::new(); for PaintRequest { buffer_requests, scale, layer_id, epoch, layer_kind } - in requests.into_iter() { + in requests { if self.current_epoch == Some(epoch) { self.paint(&mut replies, buffer_requests, scale, layer_id, layer_kind); } else { @@ -393,7 +393,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send + 'static { } }; - for kid in stacking_context.display_list.children.iter() { + for kid in &stacking_context.display_list.children { build(properties, &**kid, &page_position, &transform, &perspective, next_parent_id) } } diff --git a/components/layout/animation.rs b/components/layout/animation.rs index c9b78a50ef0..ab11433fdfa 100644 --- a/components/layout/animation.rs +++ b/components/layout/animation.rs @@ -29,7 +29,7 @@ pub fn start_transitions_if_applicable(new_animations_sender: &Sender<Animation> for i in 0..new_style.get_animation().transition_property.0.len() { // Create any property animations, if applicable. let property_animations = PropertyAnimation::from_transition(i, old_style, new_style); - for property_animation in property_animations.into_iter() { + for property_animation in property_animations { // Set the property to the initial value. property_animation.update(new_style, 0.0); @@ -65,7 +65,7 @@ pub fn process_new_animations(rw_data: &mut LayoutTaskData, pipeline_id: Pipelin } // Add new running animations. - for new_running_animation in new_running_animations.into_iter() { + for new_running_animation in new_running_animations { match running_animations.entry(OpaqueNode(new_running_animation.node)) { Entry::Vacant(entry) => { entry.insert(vec![new_running_animation]); diff --git a/components/layout/construct.rs b/components/layout/construct.rs index c9934510424..658a88a0296 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -548,7 +548,7 @@ impl<'a> FlowConstructor<'a> { fragments: successor_fragments, })) => { // Add any {ib} splits. - for split in splits.into_iter() { + for split in splits { // Pull apart the {ib} split object and push its predecessor fragments // onto the list. let InlineBlockSplit { @@ -722,7 +722,7 @@ impl<'a> FlowConstructor<'a> { let mut style = (*style).clone(); properties::modify_style_for_text(&mut style); - for content_item in text_content.into_iter() { + for content_item in text_content { let specific = match content_item { ContentItem::String(string) => { let info = UnscannedTextFragmentInfo::from_text(string); @@ -765,7 +765,7 @@ impl<'a> FlowConstructor<'a> { node: &ThreadSafeLayoutNode, fragment_accumulator: &mut InlineFragmentsAccumulator, opt_inline_block_splits: &mut LinkedList<InlineBlockSplit>) { - for split in splits.into_iter() { + for split in splits { let InlineBlockSplit { predecessors, flow: kid_flow @@ -1038,7 +1038,7 @@ impl<'a> FlowConstructor<'a> { node: &ThreadSafeLayoutNode) { let mut anonymous_flow = flow.generate_missing_child_flow(node); let mut consecutive_siblings = vec!(); - for kid_flow in child_flows.into_iter() { + for kid_flow in child_flows { if anonymous_flow.need_anonymous_flow(&*kid_flow) { consecutive_siblings.push(kid_flow); continue; diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 6b11bee1f8c..21af4e9e3ee 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -727,7 +727,7 @@ impl AbsoluteDescendants { /// /// Ignore any static y offsets, because they are None before layout. pub fn push_descendants(&mut self, given_descendants: AbsoluteDescendants) { - for elem in given_descendants.descendant_links.into_iter() { + for elem in given_descendants.descendant_links { self.descendant_links.push(elem); } } diff --git a/components/layout/generated_content.rs b/components/layout/generated_content.rs index a761ff8fc0b..3b65afdbfdd 100644 --- a/components/layout/generated_content.rs +++ b/components/layout/generated_content.rs @@ -277,11 +277,10 @@ impl<'a,'b> ResolveGeneratedContentFragmentMutator<'a,'b> { self.traversal.counters.insert((*counter_name).clone(), counter); } - for &(ref counter_name, value) in fragment.style() + for &(ref counter_name, value) in &fragment.style() .get_counters() .counter_increment - .0 - .iter() { + .0 { if let Some(ref mut counter) = self.traversal.counters.get_mut(counter_name) { counter.increment(self.level, value); continue diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 39a000d742e..ecb06a0b8e8 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -1121,7 +1121,7 @@ impl InlineFlow { let run = Arc::make_unique(&mut scanned_text_fragment_info.run); { let glyph_runs = Arc::make_unique(&mut run.glyphs); - for mut glyph_run in glyph_runs.iter_mut() { + for mut glyph_run in &mut *glyph_runs { let mut range = glyph_run.range.intersect(&fragment_range); if range.is_empty() { continue @@ -1226,7 +1226,7 @@ impl InlineFlow { for frag in &self.fragments.fragments { match frag.inline_context { Some(ref inline_context) => { - for node in inline_context.nodes.iter() { + for node in &inline_context.nodes { let font_style = node.style.get_font_arc(); let font_metrics = text::font_metrics_for_style(font_context, font_style); let line_height = text::line_height_from_style(&*node.style, &font_metrics); diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 60d8c9de306..c936dd00a16 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -114,7 +114,7 @@ pub trait ParallelPreorderDomTraversal : PreorderDomTraversal { top_down_func: ChunkedDomTraversalFunction, bottom_up_func: DomTraversalFunction) { let mut discovered_child_nodes = Vec::new(); - for unsafe_node in unsafe_nodes.0.into_iter() { + for unsafe_node in *unsafe_nodes.0 { // Get a real layout node. let node: LayoutNode = unsafe { layout_node_from_unsafe_layout_node(&unsafe_node) @@ -295,7 +295,7 @@ trait ParallelPreorderFlowTraversal : PreorderFlowTraversal { top_down_func: ChunkedFlowTraversalFunction, bottom_up_func: FlowTraversalFunction) { let mut discovered_child_flows = Vec::new(); - for mut unsafe_flow in unsafe_flows.0.into_iter() { + for mut unsafe_flow in *unsafe_flows.0 { let mut had_children = false; unsafe { // Get a real flow. diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs index 2055f9a34a7..f0d97ba827b 100644 --- a/components/net/image_cache_task.rs +++ b/components/net/image_cache_task.rs @@ -282,7 +282,7 @@ impl ImageCache { let completed_load = CompletedLoad::new(image_response.clone()); self.completed_loads.insert(url, completed_load); - for listener in pending_load.listeners.into_iter() { + for listener in pending_load.listeners { listener.notify(image_response.clone()); } } diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs index 7b87ec8830f..025ac8d20ee 100644 --- a/components/net/resource_task.rs +++ b/components/net/resource_task.rs @@ -212,7 +212,7 @@ impl ResourceManager { fn set_cookies_for_url(&mut self, request: Url, cookie_list: String, source: CookieSource) { let header = Header::parse_header(&[cookie_list.into_bytes()]); if let Ok(SetCookie(cookies)) = header { - for bare_cookie in cookies.into_iter() { + for bare_cookie in cookies { if let Some(cookie) = cookie::Cookie::new_wrapped(bare_cookie, &request, source) { self.cookie_storage.push(cookie, source); } diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 87e279d4f87..d05e099613f 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -212,7 +212,7 @@ impl JSTraceable for Heap<JSVal> { impl<T: JSTraceable> JSTraceable for Vec<T> { #[inline] fn trace(&self, trc: *mut JSTracer) { - for e in self.iter() { + for e in &*self { e.trace(trc); } } @@ -254,7 +254,7 @@ impl<K, V, S> JSTraceable for HashMap<K, V, S> { #[inline] fn trace(&self, trc: *mut JSTracer) { - for (k, v) in self.iter() { + for (k, v) in &*self { k.trace(trc); v.trace(trc); } diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index d5c7d589ed4..54ca9c1caa3 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -677,7 +677,7 @@ pub unsafe fn finalize_global(obj: *mut JSObject) { /// Trace the resources held by reserved slots of a global object pub unsafe fn trace_global(tracer: *mut JSTracer, obj: *mut JSObject) { let array = get_proto_or_iface_array(obj); - for proto in (&*array).iter() { + for proto in (*array).iter() { if !proto.is_null() { trace_object(tracer, "prototype", &*(proto as *const *mut JSObject as *const Heap<*mut JSObject>)); } diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index bbfdbc8231e..4c5fc207674 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -162,7 +162,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { let mut list = vec!(); // Step 2.2 - for longhand in longhand_properties.iter() { + for longhand in &*longhand_properties { // Step 2.2.1 let declaration = owner.get_declaration(&Atom::from_slice(&longhand)); @@ -327,7 +327,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { match longhands_from_shorthand(&property) { // Step 4 Some(longhands) => { - for longhand in longhands.iter() { + for longhand in &*longhands { elem.remove_inline_style_property(longhand) } } diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index c3d81e20ba5..c538893506b 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -899,7 +899,7 @@ impl<'a> DocumentHelpers<'a> for &'a Document { } } else { let fragment = NodeCast::from_root(self.CreateDocumentFragment()); - for node in nodes.into_iter() { + for node in nodes { match node { NodeOrString::eNode(node) => { try!(fragment.r().AppendChild(node.r())); diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 8da1c8c9373..6c8bdf028ba 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -685,7 +685,7 @@ impl<'a> ElementHelpers<'a> for &'a Element { // Usually, the reference count will be 1 here. But transitions could make it greater // than that. let existing_declarations = Arc::make_unique(existing_declarations); - for declaration in existing_declarations.iter_mut() { + for declaration in &mut *existing_declarations { if declaration.name() == property_decl.name() { *declaration = property_decl; return; diff --git a/components/script/dom/eventdispatcher.rs b/components/script/dom/eventdispatcher.rs index a99acb7b911..e8603b3b046 100644 --- a/components/script/dom/eventdispatcher.rs +++ b/components/script/dom/eventdispatcher.rs @@ -70,8 +70,8 @@ pub fn dispatch_event<'a, 'b>(target: &'a EventTarget, event.set_current_target(target.clone()); let opt_listeners = target.get_listeners(&type_); - for listeners in opt_listeners.iter() { - for listener in listeners.iter() { + for listeners in opt_listeners { + for listener in listeners { // Explicitly drop any exception on the floor. let _ = listener.HandleEvent_(target, event, Report); diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 79679ff14d2..cb2b1011a4c 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -332,8 +332,8 @@ impl<'a> EventTargetMethods for &'a EventTarget { match listener { Some(ref listener) => { let mut handlers = self.handlers.borrow_mut(); - let mut entry = handlers.get_mut(&ty); - for entry in entry.iter_mut() { + let entry = handlers.get_mut(&ty); + for entry in entry { let phase = if capture { ListenerPhase::Capturing } else { ListenerPhase::Bubbling }; let old_entry = EventListenerEntry { phase: phase, diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 8b4046cc80b..72855380540 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1867,7 +1867,7 @@ impl Node { let copy_elem = ElementCast::to_ref(copy.r()).unwrap(); let window = document.r().window(); - for ref attr in node_elem.attrs().iter() { + for ref attr in &*node_elem.attrs() { let attr = attr.root(); let newattr = Attr::new(window.r(), diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 23038771656..70477846627 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -179,7 +179,7 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { // https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-importscripts fn ImportScripts(self, url_strings: Vec<DOMString>) -> ErrorResult { let mut urls = Vec::with_capacity(url_strings.len()); - for url in url_strings.into_iter() { + for url in url_strings { let url = UrlParser::new().base_url(&self.worker_url) .parse(&url); match url { @@ -188,7 +188,7 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { }; } - for url in urls.into_iter() { + for url in urls { let (url, source) = match load_whole_resource(&self.resource_task, url) { Err(_) => return Err(Network), Ok((metadata, bytes)) => { diff --git a/components/script/page.rs b/components/script/page.rs index f4b3fd6cd18..cea63c08a38 100644 --- a/components/script/page.rs +++ b/components/script/page.rs @@ -46,7 +46,7 @@ impl IterablePage for Rc<Page> { } fn find(&self, id: PipelineId) -> Option<Rc<Page>> { if self.id == id { return Some(self.clone()); } - for page in self.children.borrow().iter() { + for page in &*self.children.borrow() { let found = page.find(id); if found.is_some() { return found; } } @@ -104,7 +104,7 @@ impl Iterator for PageIterator { fn next(&mut self) -> Option<Rc<Page>> { match self.stack.pop() { Some(next) => { - for child in next.children.borrow().iter() { + for child in &*next.children.borrow() { self.stack.push(child.clone()); } Some(next) diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index 6ea2dc443f8..cd4e6dd1d47 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -90,7 +90,7 @@ impl<'a> TreeSink for servohtmlparser::Sink { let elem = Element::create(name, None, doc.r(), ElementCreator::ParserCreated); - for attr in attrs.into_iter() { + for attr in attrs { elem.r().set_attribute_from_parser(attr.name, attr.value.into(), None); } @@ -152,7 +152,7 @@ impl<'a> TreeSink for servohtmlparser::Sink { let node: Root<Node> = target.root(); let elem = ElementCast::to_ref(node.r()) .expect("tried to set attrs on non-Element in HTML parsing"); - for attr in attrs.into_iter() { + for attr in attrs { elem.set_attribute_from_parser(attr.name, attr.value.into(), None); } } diff --git a/components/script/script_task.rs b/components/script/script_task.rs index faf1f06d202..60d8887484c 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -709,7 +709,7 @@ impl ScriptTask { } } - for (id, size) in resizes.into_iter() { + for (id, size) in resizes { self.handle_event(id, ResizeEvent(size)); } @@ -814,7 +814,7 @@ impl ScriptTask { } // Process the gathered events. - for msg in sequential.into_iter() { + for msg in sequential { match msg { MixedMessage::FromConstellation(ConstellationControlMsg::ExitPipeline(id, exit_type)) => { if self.handle_exit_pipeline_msg(id, exit_type) { @@ -1652,7 +1652,7 @@ impl ScriptTask { let document = page.document(); let mut prev_mouse_over_targets: RootedVec<JS<Node>> = RootedVec::new(); - for target in self.mouse_over_targets.borrow_mut().iter() { + for target in &*self.mouse_over_targets.borrow_mut() { prev_mouse_over_targets.push(target.clone()); } @@ -1663,7 +1663,7 @@ impl ScriptTask { document.r().handle_mouse_move_event(self.js_runtime.rt(), point, &mut mouse_over_targets); // Notify Constellation about anchors that are no longer mouse over targets. - for target in prev_mouse_over_targets.iter() { + for target in &*prev_mouse_over_targets { if !mouse_over_targets.contains(target) { if target.root().r().is_anchor_element() { let event = ConstellationMsg::NodeStatus(None); @@ -1675,7 +1675,7 @@ impl ScriptTask { } // Notify Constellation about the topmost anchor mouse over target. - for target in mouse_over_targets.iter() { + for target in &*mouse_over_targets { let target = target.root(); if target.r().is_anchor_element() { let element = ElementCast::to_ref(target.r()).unwrap(); @@ -1936,7 +1936,7 @@ fn shut_down_layout(page_tree: &Rc<Page>, exit_type: PipelineExitType) { } // Destroy the layout task. If there were node leaks, layout will now crash safely. - for chan in channels.into_iter() { + for chan in channels { chan.send(layout_interface::Msg::ExitNow(exit_type)).ok(); } } diff --git a/components/script/timers.rs b/components/script/timers.rs index 634a6a4e110..579c0d9a2c3 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -83,7 +83,7 @@ pub struct TimerManager { impl Drop for TimerManager { fn drop(&mut self) { - for (_, timer_handle) in self.active_timers.borrow_mut().iter_mut() { + for (_, timer_handle) in &mut *self.active_timers.borrow_mut() { timer_handle.cancel(); } } @@ -125,12 +125,12 @@ impl TimerManager { } pub fn suspend(&self) { - for (_, timer_handle) in self.active_timers.borrow_mut().iter_mut() { + for (_, timer_handle) in &mut *self.active_timers.borrow_mut() { timer_handle.suspend(); } } pub fn resume(&self) { - for (_, timer_handle) in self.active_timers.borrow_mut().iter_mut() { + for (_, timer_handle) in &mut *self.active_timers.borrow_mut() { timer_handle.resume(); } } diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs index 953caa675b5..74776bdfd5c 100644 --- a/components/style/properties.mako.rs +++ b/components/style/properties.mako.rs @@ -5429,7 +5429,7 @@ pub mod shorthands { let results = try!(input.parse_comma_separated(parse_one_transition)); let (mut properties, mut durations) = (Vec::new(), Vec::new()); let (mut timing_functions, mut delays) = (Vec::new(), Vec::new()); - for result in results.into_iter() { + for result in results { properties.push(result.transition_property); durations.push(result.transition_duration); timing_functions.push(result.transition_timing_function); diff --git a/ports/cef/browser.rs b/ports/cef/browser.rs index dd8f99f1295..14c08848765 100644 --- a/ports/cef/browser.rs +++ b/ports/cef/browser.rs @@ -227,7 +227,7 @@ pub fn get_null_window_handle() -> cef_window_handle_t { pub fn update() { BROWSERS.with(|browsers| { - for browser in browsers.borrow().iter() { + for browser in &browsers.borrow() { if browser.downcast().callback_executed.get() == false { browser_callback_after_created(browser.clone()); } diff --git a/ports/cef/command_line.rs b/ports/cef/command_line.rs index 7f70c77bafa..bf010075cdc 100644 --- a/ports/cef/command_line.rs +++ b/ports/cef/command_line.rs @@ -59,7 +59,7 @@ pub extern "C" fn command_line_get_switch_value(cmd: *mut cef_command_line_t, na let slice = slice::from_raw_parts(buf, (*cs).length as usize); let opt = String::from_utf16(slice).unwrap(); //debug!("opt: {}", opt); - for s in (*cl).argv.iter() { + for s in &(*cl).argv { let o = s.trim_left_matches('-'); //debug!("arg: {}", o); if o.starts_with(&opt) { @@ -104,4 +104,3 @@ cef_stub_static_method_impls! { fn cef_command_line_create_command_line() -> *mut cef_command_line_t fn cef_command_line_get_global_command_line() -> *mut cef_command_line_t } - diff --git a/ports/cef/string_multimap.rs b/ports/cef/string_multimap.rs index c1760c65d74..2dad52bd21f 100644 --- a/ports/cef/string_multimap.rs +++ b/ports/cef/string_multimap.rs @@ -82,7 +82,7 @@ pub extern "C" fn cef_string_multimap_key(smm: *mut cef_string_multimap_t, index if index < 0 || smm.is_null() { return 0; } let mut rem = index as usize; - for (key, val) in (*smm).iter() { + for (key, val) in &(*smm) { if rem < (*val).len() { return cef_string_utf16_set((*key).as_bytes().as_ptr() as *const u16, (*key).len() as u64, |