Skip to content

Commit

Permalink
Remove unused code from a bunch of crates
Browse files Browse the repository at this point in the history
  • Loading branch information
est31 committed Jun 3, 2019
1 parent 8b6ed3d commit e64de8d
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 74 deletions.
20 changes: 0 additions & 20 deletions components/canvas/canvas_data.rs
Expand Up @@ -997,26 +997,6 @@ fn write_image(
);
}

pub trait PointToi32 {
fn to_i32(&self) -> Point2D<i32>;
}

impl PointToi32 for Point2D<f64> {
fn to_i32(&self) -> Point2D<i32> {
Point2D::new(self.x.to_i32().unwrap(), self.y.to_i32().unwrap())
}
}

pub trait SizeToi32 {
fn to_i32(&self) -> Size2D<i32>;
}

impl SizeToi32 for Size2D<f64> {
fn to_i32(&self) -> Size2D<i32> {
Size2D::new(self.width.to_i32().unwrap(), self.height.to_i32().unwrap())
}
}

pub trait RectToi32 {
fn to_i32(&self) -> Rect<i32>;
fn ceil(&self) -> Rect<f64>;
Expand Down
11 changes: 0 additions & 11 deletions components/canvas/gl_context.rs
Expand Up @@ -147,17 +147,6 @@ impl GLContextWrapper {
}
}

pub fn unbind(&self) {
match *self {
GLContextWrapper::Native(ref ctx) => {
ctx.unbind().unwrap();
},
GLContextWrapper::OSMesa(ref ctx) => {
ctx.unbind().unwrap();
},
}
}

pub fn apply_command(
&self,
cmd: WebGLCommand,
Expand Down
8 changes: 0 additions & 8 deletions components/msg/constellation_msg.rs
Expand Up @@ -122,17 +122,9 @@ impl PipelineId {
}
}

pub fn root_scroll_node(&self) -> webrender_api::SpatialId {
webrender_api::SpatialId::root_scroll_node(self.to_webrender())
}

pub fn root_scroll_id(&self) -> webrender_api::ExternalScrollId {
webrender_api::ExternalScrollId(0, self.to_webrender())
}

pub fn root_clip_node(&self) -> webrender_api::ClipId {
webrender_api::ClipId::root(self.to_webrender())
}
}

impl fmt::Display for PipelineId {
Expand Down
22 changes: 0 additions & 22 deletions components/range/lib.rs
Expand Up @@ -18,8 +18,6 @@ pub trait Int:
{
fn zero() -> Self;
fn one() -> Self;
fn max_value() -> Self;
fn from_usize(n: usize) -> Option<Self>;
fn to_usize(self) -> usize;
}
impl Int for isize {
Expand All @@ -32,14 +30,6 @@ impl Int for isize {
1
}
#[inline]
fn max_value() -> isize {
::std::isize::MAX
}
#[inline]
fn from_usize(n: usize) -> Option<isize> {
num_traits::NumCast::from(n)
}
#[inline]
fn to_usize(self) -> usize {
num_traits::NumCast::from(self).unwrap()
}
Expand All @@ -54,14 +44,6 @@ impl Int for usize {
1
}
#[inline]
fn max_value() -> usize {
::std::usize::MAX
}
#[inline]
fn from_usize(n: usize) -> Option<usize> {
Some(n)
}
#[inline]
fn to_usize(self) -> usize {
self
}
Expand Down Expand Up @@ -134,10 +116,6 @@ macro_rules! int_range_index {
#[inline]
fn one() -> $Self_ { $Self_($crate::Int::one()) }
#[inline]
fn max_value() -> $Self_ { $Self_($crate::Int::max_value()) }
#[inline]
fn from_usize(n: usize) -> Option<$Self_> { $crate::Int::from_usize(n).map($Self_) }
#[inline]
fn to_usize(self) -> usize { self.to_usize() }
}

Expand Down
6 changes: 0 additions & 6 deletions components/remutex/lib.rs
Expand Up @@ -62,12 +62,6 @@ impl AtomicOptThreadId {
let number = self.0.load(ordering);
NonZeroUsize::new(number).map(ThreadId)
}
#[allow(unsafe_code)]
pub fn swap(&self, value: Option<ThreadId>, ordering: Ordering) -> Option<ThreadId> {
let number = value.map(|id| id.0.get()).unwrap_or(0);
let number = self.0.swap(number, ordering);
NonZeroUsize::new(number).map(ThreadId)
}
}

/// A type for hand-over-hand mutexes.
Expand Down
4 changes: 4 additions & 0 deletions components/script/compartments.rs
Expand Up @@ -27,4 +27,8 @@ impl<'a> InCompartment<'a> {
pub fn in_compartment(token: &AlreadyInCompartment) -> InCompartment {
InCompartment::Already(token)
}

pub fn entered(token: &JSAutoRealm) -> InCompartment {
InCompartment::Entered(token)
}
}
5 changes: 0 additions & 5 deletions components/selectors/bloom.rs
Expand Up @@ -18,11 +18,6 @@ const KEY_MASK: u32 = (1 << KEY_SIZE) - 1;
/// A counting Bloom filter with 8-bit counters.
pub type BloomFilter = CountingBloomFilter<BloomStorageU8>;

/// A non-counting Bloom filter.
///
/// Effectively a counting Bloom filter with 1-bit counters.
pub type NonCountingBloomFilter = CountingBloomFilter<BloomStorageBool>;

/// A counting Bloom filter with parameterized storage to handle
/// counters of different sizes. For now we assume that having two hash
/// functions is enough, but we may revisit that decision later.
Expand Down
4 changes: 2 additions & 2 deletions components/style/properties/cascade.rs
Expand Up @@ -421,7 +421,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
}

#[inline(always)]
fn apply_declaration<Phase: CascadePhase>(
fn apply_declaration(
&mut self,
longhand_id: LonghandId,
declaration: &PropertyDeclaration,
Expand Down Expand Up @@ -544,7 +544,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
// FIXME(emilio): We should avoid generating code for logical
// longhands and just use the physical ones, then rename
// physical_longhand_id to just longhand_id.
self.apply_declaration::<Phase>(longhand_id, &*declaration);
self.apply_declaration(longhand_id, &*declaration);
}

if Phase::is_early() {
Expand Down

0 comments on commit e64de8d

Please sign in to comment.