From 6f0575095628fd7ea552b84b82c1a70e51615e9d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 16:41:32 +0100 Subject: [PATCH 01/10] Use u32 for outstanding_paint_msgs. --- components/compositing/compositor.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 60bfbdc35e2..16b788b1972 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -93,7 +93,7 @@ pub struct IOCompositor { shutdown_state: ShutdownState, /// Tracks outstanding paint_msg's sent to the paint tasks. - outstanding_paint_msgs: uint, + outstanding_paint_msgs: u32, /// Tracks the last composite time. last_composite_time: u64, @@ -463,7 +463,7 @@ impl IOCompositor { self.has_paint_msg_tracking() && self.outstanding_paint_msgs > 0 } - fn add_outstanding_paint_msg(&mut self, count: uint) { + fn add_outstanding_paint_msg(&mut self, count: u32) { // return early if not tracking paint_msg's if !self.has_paint_msg_tracking() { return; From 54c006d1597af4a8e46b262b807913399fdb49d9 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 17:04:41 +0100 Subject: [PATCH 02/10] Use u32 for reflow ids. --- components/script/dom/window.rs | 6 +++--- components/script/layout_interface.rs | 2 +- components/script/script_task.rs | 2 +- components/script_traits/lib.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index ce7dc34e77d..bf3f07990ae 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -119,7 +119,7 @@ pub struct Window { parent_info: Option<(PipelineId, SubpageId)>, /// Unique id for last reflow request; used for confirming completion reply. - last_reflow_id: Cell, + last_reflow_id: Cell, /// Global static data related to the DOM. dom_static: GlobalStaticData, @@ -460,7 +460,7 @@ pub trait WindowHelpers { fn layout(&self) -> &LayoutRPC; fn content_box_query(self, content_box_request: TrustedNodeAddress) -> Rect; fn content_boxes_query(self, content_boxes_request: TrustedNodeAddress) -> Vec>; - fn handle_reflow_complete_msg(self, reflow_id: uint); + fn handle_reflow_complete_msg(self, reflow_id: u32); fn handle_resize_inactive_msg(self, new_size: WindowSizeData); fn set_fragment_name(self, fragment: Option); fn steal_fragment_name(self) -> Option; @@ -631,7 +631,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> { rects } - fn handle_reflow_complete_msg(self, reflow_id: uint) { + fn handle_reflow_complete_msg(self, reflow_id: u32) { let last_reflow_id = self.last_reflow_id.get(); if last_reflow_id == reflow_id { *self.layout_join_port.borrow_mut() = None; diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index e14475aa793..9b7e3a292ea 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -115,7 +115,7 @@ pub struct Reflow { /// The channel that we send a notification to. pub script_join_chan: Sender<()>, /// Unique identifier - pub id: uint, + pub id: u32, /// The type of query if any to perform during this reflow. pub query_type: ReflowQueryType, /// A clipping rectangle for the page, an enlarged rectangle containing the viewport. diff --git a/components/script/script_task.rs b/components/script/script_task.rs index e5463285200..b267c036435 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -846,7 +846,7 @@ impl ScriptTask { } /// Handles a notification that reflow completed. - fn handle_reflow_complete_msg(&self, pipeline_id: PipelineId, reflow_id: uint) { + fn handle_reflow_complete_msg(&self, pipeline_id: PipelineId, reflow_id: u32) { debug!("Script: Reflow {:?} complete for {:?}", reflow_id, pipeline_id); let page = self.root_page(); let page = page.find(pipeline_id).expect( diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 5b4be3731b2..da93a143dc2 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -61,7 +61,7 @@ pub enum ConstellationControlMsg { /// Sends a DOM event. SendEvent(PipelineId, CompositorEvent), /// Notifies script that reflow is finished. - ReflowComplete(PipelineId, uint), + ReflowComplete(PipelineId, u32), /// Notifies script of the viewport. Viewport(PipelineId, Rect), /// Requests that the script task immediately send the constellation the title of a pipeline. From f50530577c8cb116e261d674d93263fad93b6d1d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 17:06:54 +0100 Subject: [PATCH 03/10] Use usize in test_lru_cache. --- components/util/cache.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/util/cache.rs b/components/util/cache.rs index 2f4e88b5f0e..8719c176921 100644 --- a/components/util/cache.rs +++ b/components/util/cache.rs @@ -192,7 +192,7 @@ fn test_lru_cache() { let four = Cell::new("four"); // Test normal insertion. - let mut cache: LRUCache> = LRUCache::new(2); // (_, _) (cache is empty) + let mut cache: LRUCache> = LRUCache::new(2); // (_, _) (cache is empty) cache.insert(1, one); // (1, _) cache.insert(2, two); // (1, 2) cache.insert(3, three); // (2, 3) From 43ed033effae75fa42d67526103dd9ed3cbe6985 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 17:07:10 +0100 Subject: [PATCH 04/10] Use isize/usize in range. --- components/gfx/paint_context.rs | 2 +- components/gfx/text/glyph.rs | 46 ++++++++++++++++----------------- components/layout/fragment.rs | 6 ++--- components/layout/inline.rs | 10 +++---- components/util/lib.rs | 1 - components/util/range.rs | 24 ++++++++--------- 6 files changed, 44 insertions(+), 45 deletions(-) diff --git a/components/gfx/paint_context.rs b/components/gfx/paint_context.rs index 88c031a165f..da15dc6b2ae 100644 --- a/components/gfx/paint_context.rs +++ b/components/gfx/paint_context.rs @@ -1199,7 +1199,7 @@ impl ScaledFontExtensionMethods for ScaledFont { let mut origin = baseline_origin.clone(); let mut azglyphs = vec!(); - azglyphs.reserve(range.length().to_uint()); + azglyphs.reserve(range.length().to_usize()); for slice in run.natural_word_slices_in_range(range) { for (_i, glyph) in slice.glyphs.iter_glyphs_for_char_range(&slice.range) { diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs index 4ed96281a85..5ebd33916e8 100644 --- a/components/gfx/text/glyph.rs +++ b/components/gfx/text/glyph.rs @@ -455,7 +455,7 @@ pub enum GlyphInfo<'a> { impl<'a> GlyphInfo<'a> { pub fn id(self) -> GlyphId { match self { - GlyphInfo::Simple(store, entry_i) => store.entry_buffer[entry_i.to_uint()].id(), + GlyphInfo::Simple(store, entry_i) => store.entry_buffer[entry_i.to_usize()].id(), GlyphInfo::Detail(store, entry_i, detail_j) => { store.detail_store.get_detailed_glyph_with_index(entry_i, detail_j).id } @@ -466,7 +466,7 @@ impl<'a> GlyphInfo<'a> { // FIXME: Resolution conflicts with IteratorUtil trait so adding trailing _ pub fn advance(self) -> Au { match self { - GlyphInfo::Simple(store, entry_i) => store.entry_buffer[entry_i.to_uint()].advance(), + GlyphInfo::Simple(store, entry_i) => store.entry_buffer[entry_i.to_usize()].advance(), GlyphInfo::Detail(store, entry_i, detail_j) => { store.detail_store.get_detailed_glyph_with_index(entry_i, detail_j).advance } @@ -575,13 +575,13 @@ impl<'a> GlyphStore { }; // FIXME(pcwalton): Is this necessary? I think it's a no-op. - entry = entry.adapt_character_flags_of_entry(self.entry_buffer[i.to_uint()]); + entry = entry.adapt_character_flags_of_entry(self.entry_buffer[i.to_usize()]); if character == Some(' ') { entry = entry.set_char_is_space() } - self.entry_buffer[i.to_uint()] = entry; + self.entry_buffer[i.to_usize()] = entry; } pub fn add_glyphs_for_char_index(&mut self, i: CharIndex, data_for_glyphs: &[GlyphData]) { @@ -605,11 +605,11 @@ impl<'a> GlyphStore { first_glyph_data.ligature_start, glyph_count) } - }.adapt_character_flags_of_entry(self.entry_buffer[i.to_uint()]); + }.adapt_character_flags_of_entry(self.entry_buffer[i.to_usize()]); debug!("Adding multiple glyphs[idx={:?}, count={}]: {:?}", i, glyph_count, entry); - self.entry_buffer[i.to_uint()] = entry; + self.entry_buffer[i.to_usize()] = entry; } // used when a character index has no associated glyph---for example, a ligature continuation. @@ -619,7 +619,7 @@ impl<'a> GlyphStore { let entry = GlyphEntry::complex(cluster_start, ligature_start, 0); debug!("adding spacer for chracter without associated glyph[idx={:?}]", i); - self.entry_buffer[i.to_uint()] = entry; + self.entry_buffer[i.to_usize()] = entry; } pub fn iter_glyphs_for_char_index(&'a self, i: CharIndex) -> GlyphIterator<'a> { @@ -652,57 +652,57 @@ impl<'a> GlyphStore { // getter methods pub fn char_is_space(&self, i: CharIndex) -> bool { assert!(i < self.char_len()); - self.entry_buffer[i.to_uint()].char_is_space() + self.entry_buffer[i.to_usize()].char_is_space() } pub fn char_is_tab(&self, i: CharIndex) -> bool { assert!(i < self.char_len()); - self.entry_buffer[i.to_uint()].char_is_tab() + self.entry_buffer[i.to_usize()].char_is_tab() } pub fn char_is_newline(&self, i: CharIndex) -> bool { assert!(i < self.char_len()); - self.entry_buffer[i.to_uint()].char_is_newline() + self.entry_buffer[i.to_usize()].char_is_newline() } pub fn is_ligature_start(&self, i: CharIndex) -> bool { assert!(i < self.char_len()); - self.entry_buffer[i.to_uint()].is_ligature_start() + self.entry_buffer[i.to_usize()].is_ligature_start() } pub fn is_cluster_start(&self, i: CharIndex) -> bool { assert!(i < self.char_len()); - self.entry_buffer[i.to_uint()].is_cluster_start() + self.entry_buffer[i.to_usize()].is_cluster_start() } pub fn can_break_before(&self, i: CharIndex) -> BreakType { assert!(i < self.char_len()); - self.entry_buffer[i.to_uint()].can_break_before() + self.entry_buffer[i.to_usize()].can_break_before() } // setter methods pub fn set_char_is_space(&mut self, i: CharIndex) { assert!(i < self.char_len()); - let entry = self.entry_buffer[i.to_uint()]; - self.entry_buffer[i.to_uint()] = entry.set_char_is_space(); + let entry = self.entry_buffer[i.to_usize()]; + self.entry_buffer[i.to_usize()] = entry.set_char_is_space(); } pub fn set_char_is_tab(&mut self, i: CharIndex) { assert!(i < self.char_len()); - let entry = self.entry_buffer[i.to_uint()]; - self.entry_buffer[i.to_uint()] = entry.set_char_is_tab(); + let entry = self.entry_buffer[i.to_usize()]; + self.entry_buffer[i.to_usize()] = entry.set_char_is_tab(); } pub fn set_char_is_newline(&mut self, i: CharIndex) { assert!(i < self.char_len()); - let entry = self.entry_buffer[i.to_uint()]; - self.entry_buffer[i.to_uint()] = entry.set_char_is_newline(); + let entry = self.entry_buffer[i.to_usize()]; + self.entry_buffer[i.to_usize()] = entry.set_char_is_newline(); } pub fn set_can_break_before(&mut self, i: CharIndex, t: BreakType) { assert!(i < self.char_len()); - let entry = self.entry_buffer[i.to_uint()]; - self.entry_buffer[i.to_uint()] = entry.set_can_break_before(t); + let entry = self.entry_buffer[i.to_usize()]; + self.entry_buffer[i.to_usize()] = entry.set_can_break_before(t); } pub fn space_count_in_range(&self, range: &Range) -> u32 { @@ -723,7 +723,7 @@ impl<'a> GlyphStore { for index in range.each_index() { // TODO(pcwalton): Handle spaces that are detailed glyphs -- these are uncommon but // possible. - let entry = &mut self.entry_buffer[index.to_uint()]; + let entry = &mut self.entry_buffer[index.to_usize()]; if entry.is_simple() && entry.char_is_space() { // FIXME(pcwalton): This can overflow for very large font-sizes. let advance = @@ -789,7 +789,7 @@ impl<'a> Iterator for GlyphIterator<'a> { self.char_range.next().and_then(|i| { self.char_index = i; assert!(i < self.store.char_len()); - let entry = self.store.entry_buffer[i.to_uint()]; + let entry = self.store.entry_buffer[i.to_usize()]; if entry.is_simple() { Some((self.char_index, GlyphInfo::Simple(self.store, i))) } else { diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 1fa36d7beea..0458c2bb738 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1600,8 +1600,8 @@ impl Fragment { // FIXME(pcwalton): Is there a more clever (i.e. faster) way to do this? if let Some(ref mut inline_end_range) = inline_end_range { let inline_end_fragment_text = - text_fragment_info.run.text.slice_chars(inline_end_range.begin().to_uint(), - inline_end_range.end().to_uint()); + text_fragment_info.run.text.slice_chars(inline_end_range.begin().to_usize(), + inline_end_range.end().to_usize()); let mut leading_whitespace_character_count = 0i; for ch in inline_end_fragment_text.chars() { if ch.is_whitespace() { @@ -2128,7 +2128,7 @@ pub enum CoordinateSystem { /// if any modifications were made. fn strip_trailing_whitespace(text_run: &TextRun, range: &mut Range) -> bool { // FIXME(pcwalton): Is there a more clever (i.e. faster) way to do this? - let text = text_run.text.slice_chars(range.begin().to_uint(), range.end().to_uint()); + let text = text_run.text.slice_chars(range.begin().to_usize(), range.end().to_usize()); let mut trailing_whitespace_character_count = 0i; for ch in text.chars().rev() { if ch.is_whitespace() { diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 0b645aa0971..5dd4ecf36e3 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -915,7 +915,7 @@ impl InlineFlow { } for fragment_index in range(line.range.begin(), line.range.end()) { - let fragment = fragments.get_mut(fragment_index.to_uint()); + let fragment = fragments.get_mut(fragment_index.to_usize()); let size = fragment.border_box.size; fragment.border_box = LogicalRect::new(fragment.style.writing_mode, inline_start_position_for_fragment, @@ -940,7 +940,7 @@ impl InlineFlow { // First, calculate the number of expansion opportunities (spaces, normally). let mut expansion_opportunities = 0i32; for fragment_index in line.range.each_index() { - let fragment = fragments.get(fragment_index.to_uint()); + let fragment = fragments.get(fragment_index.to_usize()); let scanned_text_fragment_info = if let SpecificFragmentInfo::ScannedText(ref info) = fragment.specific { info @@ -957,7 +957,7 @@ impl InlineFlow { let space_per_expansion_opportunity = slack_inline_size.to_subpx() / (expansion_opportunities as f64); for fragment_index in line.range.each_index() { - let fragment = fragments.get_mut(fragment_index.to_uint()); + let fragment = fragments.get_mut(fragment_index.to_usize()); let mut scanned_text_fragment_info = if let SpecificFragmentInfo::ScannedText(ref mut info) = fragment.specific { info @@ -1004,7 +1004,7 @@ impl InlineFlow { baseline_distance_from_block_start: Au, largest_depth_below_baseline: Au) { for fragment_index in range(line.range.begin(), line.range.end()) { - let fragment = fragments.get_mut(fragment_index.to_uint()); + let fragment = fragments.get_mut(fragment_index.to_usize()); match fragment.vertical_align() { vertical_align::T::top => { fragment.border_box.start.b = fragment.border_box.start.b + @@ -1221,7 +1221,7 @@ impl Flow for InlineFlow { mut largest_block_size_for_bottom_fragments) = (Au(0), Au(0)); for fragment_index in range(line.range.begin(), line.range.end()) { - let fragment = &mut self.fragments.fragments[fragment_index.to_uint()]; + let fragment = &mut self.fragments.fragments[fragment_index.to_usize()]; let InlineMetrics { mut block_size_above_baseline, diff --git a/components/util/lib.rs b/components/util/lib.rs index 4eaf40b465f..c30e4c714c9 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -8,7 +8,6 @@ #![feature(core)] #![feature(exit_status)] #![feature(hash)] -#![feature(int_uint)] #![feature(io)] #![feature(old_io)] #![feature(optin_builtin_traits)] diff --git a/components/util/range.rs b/components/util/range.rs index 86d670d2f84..0df81a7b413 100644 --- a/components/util/range.rs +++ b/components/util/range.rs @@ -16,13 +16,13 @@ pub trait RangeIndex: Int + fmt::Debug { fn get(self) -> Self::Index; } -impl RangeIndex for int { - type Index = int; +impl RangeIndex for isize { + type Index = isize; #[inline] - fn new(x: int) -> int { x } + fn new(x: isize) -> isize { x } #[inline] - fn get(self) -> int { self } + fn get(self) -> isize { self } } /// Implements a range index type with operator overloads @@ -35,8 +35,8 @@ macro_rules! int_range_index { impl $Self_ { #[inline] - pub fn to_uint(self) -> uint { - self.get() as uint + pub fn to_usize(self) -> usize { + self.get() as usize } } @@ -172,16 +172,16 @@ macro_rules! int_range_index { } } - impl Shl for $Self_ { + impl Shl for $Self_ { type Output = $Self_; - fn shl(self, n: uint) -> $Self_ { + fn shl(self, n: usize) -> $Self_ { $Self_(self.get() << n) } } - impl Shr for $Self_ { + impl Shr for $Self_ { type Output = $Self_; - fn shr(self, n: uint) -> $Self_ { + fn shr(self, n: usize) -> $Self_ { $Self_(self.get() >> n) } } @@ -247,7 +247,7 @@ impl> Iterator for EachIndex { } #[inline] - fn size_hint(&self) -> (uint, Option) { + fn size_hint(&self) -> (usize, Option) { self.it.size_hint() } } @@ -399,7 +399,7 @@ impl> Range { #[inline] pub fn is_valid_for_string(&self, s: &str) -> bool { let s_len = s.len(); - match num::cast::(s_len) { + match num::cast::(s_len) { Some(len) => { let len = RangeIndex::new(len); self.begin() < len From ac3c076892898ad2cb3e8722d9697957f45b9143 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 17:31:57 +0100 Subject: [PATCH 05/10] Use u32 for Epoch. --- components/msg/compositor_msg.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/msg/compositor_msg.rs b/components/msg/compositor_msg.rs index 54dc125f589..c51a0df6a0c 100644 --- a/components/msg/compositor_msg.rs +++ b/components/msg/compositor_msg.rs @@ -34,7 +34,7 @@ pub enum ReadyState { /// A newtype struct for denoting the age of messages; prevents race conditions. #[derive(PartialEq, Eq, Debug, Copy)] -pub struct Epoch(pub uint); +pub struct Epoch(pub u32); impl Epoch { pub fn next(&mut self) { From 37c271a260c895f83c38d322d1f31303ace7b61c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 17:55:20 +0100 Subject: [PATCH 06/10] Use usize and u32 for LayerId. --- components/layout/block.rs | 4 ++-- components/layout/flow.rs | 9 +++------ components/msg/compositor_msg.rs | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/components/layout/block.rs b/components/layout/block.rs index 231f406d25a..abaa80a06ab 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -1869,11 +1869,11 @@ impl Flow for BlockFlow { self.fragment.border_box - self.fragment.style().logical_border_width() } - fn layer_id(&self, fragment_index: uint) -> LayerId { + fn layer_id(&self, fragment_index: u32) -> LayerId { // FIXME(#2010, pcwalton): This is a hack and is totally bogus in the presence of pseudo- // elements. But until we have incremental reflow we can't do better--we recreate the flow // for every DOM node so otherwise we nuke layers on every reflow. - LayerId(self.fragment.node.id() as uint, fragment_index) + LayerId(self.fragment.node.id() as usize, fragment_index) } fn is_absolute_containing_block(&self) -> bool { diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 46b69e2deaa..2840f071411 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -311,12 +311,9 @@ pub trait Flow: fmt::Debug + Sync { /// Returns a layer ID for the given fragment. #[allow(unsafe_code)] - fn layer_id(&self, fragment_id: uint) -> LayerId { - unsafe { - let obj = mem::transmute::<&&Self, &raw::TraitObject>(&self); - let pointer: uint = mem::transmute(obj.data); - LayerId(pointer, fragment_id) - } + fn layer_id(&self, fragment_id: u32) -> LayerId { + let obj = unsafe { mem::transmute::<&&Self, &raw::TraitObject>(&self) }; + LayerId(obj.data as usize, fragment_id) } /// Attempts to perform incremental fixup of this flow by replacing its fragment's style with diff --git a/components/msg/compositor_msg.rs b/components/msg/compositor_msg.rs index c51a0df6a0c..d306af649a9 100644 --- a/components/msg/compositor_msg.rs +++ b/components/msg/compositor_msg.rs @@ -44,7 +44,7 @@ impl Epoch { } #[derive(Clone, PartialEq, Eq, Copy)] -pub struct LayerId(pub uint, pub uint); +pub struct LayerId(pub usize, pub u32); impl Debug for LayerId { fn fmt(&self, f: &mut Formatter) -> fmt::Result { From 2f3060c8a73b01eac90dbb5ecd300aa94ac07a22 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 19:56:39 +0100 Subject: [PATCH 07/10] Use u32 for FrameId. --- components/msg/constellation_msg.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 86904e0cd47..9eb2a0066b8 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -309,7 +309,7 @@ pub enum NavigationDirection { } #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] -pub struct FrameId(pub uint); +pub struct FrameId(pub u32); #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] pub struct WorkerId(pub uint); From c98d92df003578f3754f3b8d64e73862a404ef99 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 28 Mar 2015 15:55:01 +0100 Subject: [PATCH 08/10] Use u32 for WorkerId. --- components/msg/constellation_msg.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 9eb2a0066b8..696dfb2e397 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -312,7 +312,7 @@ pub enum NavigationDirection { pub struct FrameId(pub u32); #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] -pub struct WorkerId(pub uint); +pub struct WorkerId(pub u32); #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] pub struct PipelineId(pub uint); From 131270c1d3efbb1a7904d915605561eb9817c7ab Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 20:06:59 +0100 Subject: [PATCH 09/10] Use u32 for PipelineId. --- components/msg/constellation_msg.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 696dfb2e397..d19d93d0a99 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -315,7 +315,7 @@ pub struct FrameId(pub u32); pub struct WorkerId(pub u32); #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] -pub struct PipelineId(pub uint); +pub struct PipelineId(pub u32); #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] pub struct SubpageId(pub uint); From 864679db243633c910083d00a16c552365618912 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 27 Mar 2015 20:24:46 +0100 Subject: [PATCH 10/10] Use u32 for SubpageId. --- components/msg/constellation_msg.rs | 2 +- components/msg/lib.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index d19d93d0a99..aa0cc4230f3 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -318,7 +318,7 @@ pub struct WorkerId(pub u32); pub struct PipelineId(pub u32); #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] -pub struct SubpageId(pub uint); +pub struct SubpageId(pub u32); // The type of pipeline exit. During complete shutdowns, pipelines do not have to // release resources automatically released on process termination. diff --git a/components/msg/lib.rs b/components/msg/lib.rs index b4517b2fff9..7b52067c927 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,8 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#![feature(int_uint)] - extern crate azure; #[macro_use] extern crate bitflags; extern crate geom;