Remove unused code (3/N)

components/canvas/canvas_data.rs

@@ -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>;

components/canvas/gl_context.rs

@@ -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,

components/msg/constellation_msg.rs

@@ -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 {

components/range/lib.rs

@@ -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 {
@@ -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()
     }
@@ -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
     }
@@ -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() }
         }
 

components/remutex/lib.rs

@@ -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.

components/script/document_loader.rs

@@ -25,19 +25,6 @@ pub enum LoadType {
     Media,
 }
 
-impl LoadType {
-    fn url(&self) -> Option<&ServoUrl> {
-        match *self {
-            LoadType::Image(ref url) |
-            LoadType::Script(ref url) |
-            LoadType::Subframe(ref url) |
-            LoadType::Stylesheet(ref url) |
-            LoadType::PageSource(ref url) => Some(url),
-            LoadType::Media => None,
-        }
-    }
-}
-
 /// Canary value ensuring that manually added blocking loads (ie. ones that weren't
 /// created via DocumentLoader::fetch_async) are always removed by the time
 /// that the owner is destroyed.
@@ -67,11 +54,6 @@ impl LoadBlocker {
         }
         *blocker = None;
     }
-
-    /// Return the url associated with this load.
-    pub fn url(&self) -> Option<&ServoUrl> {
-        self.load.as_ref().and_then(LoadType::url)
-    }
 }
 
 impl Drop for LoadBlocker {

components/script/dom/attr.rs

@@ -252,10 +252,8 @@ impl Attr {
 pub trait AttrHelpersForLayout {
     unsafe fn value_forever(&self) -> &'static AttrValue;
     unsafe fn value_ref_forever(&self) -> &'static str;
-    unsafe fn value_atom_forever(&self) -> Option<Atom>;
     unsafe fn value_tokens_forever(&self) -> Option<&'static [Atom]>;
     unsafe fn local_name_atom_forever(&self) -> LocalName;
-    unsafe fn value_for_layout(&self) -> &AttrValue;
 }
 
 #[allow(unsafe_code)]
@@ -271,15 +269,6 @@ impl AttrHelpersForLayout for LayoutDom<Attr> {
         &**self.value_forever()
     }
 
-    #[inline]
-    unsafe fn value_atom_forever(&self) -> Option<Atom> {
-        let value = (*self.unsafe_get()).value.borrow_for_layout();
-        match *value {
-            AttrValue::Atom(ref val) => Some(val.clone()),
-            _ => None,
-        }
-    }
-
     #[inline]
     unsafe fn value_tokens_forever(&self) -> Option<&'static [Atom]> {
         // This transmute is used to cheat the lifetime restriction.
@@ -293,9 +282,4 @@ impl AttrHelpersForLayout for LayoutDom<Attr> {
     unsafe fn local_name_atom_forever(&self) -> LocalName {
         (*self.unsafe_get()).identifier.local_name.clone()
     }
-
-    #[inline]
-    unsafe fn value_for_layout(&self) -> &AttrValue {
-        (*self.unsafe_get()).value.borrow_for_layout()
-    }
 }

components/script/dom/bindings/mod.rs

@@ -168,9 +168,6 @@ pub mod codegen {
     pub mod InterfaceObjectMap {
         include!(concat!(env!("OUT_DIR"), "/InterfaceObjectMap.rs"));
     }
-    pub mod InterfaceTypes {
-        include!(concat!(env!("OUT_DIR"), "/InterfaceTypes.rs"));
-    }
     #[allow(dead_code, unused_imports)]
     pub mod InheritTypes {
         include!(concat!(env!("OUT_DIR"), "/InheritTypes.rs"));

components/script/dom/bindings/root.rs

@@ -671,14 +671,6 @@ impl<T: DomObject> LayoutDom<T> {
         debug_assert!(thread_state::get().is_layout());
         self.ptr.as_ptr()
     }
-
-    /// Returns a reference to the interior of this JS object. This method is
-    /// safe to call because it originates from the layout thread, and it cannot
-    /// mutate DOM nodes.
-    pub fn get_for_script(&self) -> &T {
-        debug_assert!(thread_state::get().is_script());
-        unsafe { &*self.ptr.as_ptr() }
-    }
 }
 
 /// Helper trait for safer manipulations of `Option<Heap<T>>` values.

components/script/dom/bindings/str.rs

@@ -17,7 +17,7 @@ use std::marker::PhantomData;
 use std::ops;
 use std::ops::{Deref, DerefMut};
 use std::str;
-use std::str::{Bytes, FromStr};
+use std::str::FromStr;
 
 /// Encapsulates the IDL `ByteString` type.
 #[derive(Clone, Debug, Default, Eq, JSTraceable, MallocSizeOf, PartialEq)]
@@ -40,11 +40,6 @@ impl ByteString {
         self.0.len()
     }
 
-    /// Compare `self` to `other`, matching A–Z and a–z as equal.
-    pub fn eq_ignore_case(&self, other: &ByteString) -> bool {
-        self.0.eq_ignore_ascii_case(&other.0)
-    }
-
     /// Returns `self` with A–Z replaced by a–z.
     pub fn to_lower(&self) -> ByteString {
         ByteString::new(self.0.to_ascii_lowercase())
@@ -219,11 +214,6 @@ impl DOMString {
         self.0.truncate(new_len);
     }
 
-    /// An iterator over the bytes of this `DOMString`.
-    pub fn bytes(&self) -> Bytes {
-        self.0.bytes()
-    }
-
     /// Removes newline characters according to <https://infra.spec.whatwg.org/#strip-newlines>.
     pub fn strip_newlines(&mut self) {
         self.0.retain(|c| c != '\r' && c != '\n');

components/script/dom/dissimilaroriginlocation.rs

@@ -12,7 +12,6 @@ use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::str::USVString;
 use crate::dom::dissimilaroriginwindow::DissimilarOriginWindow;
 use dom_struct::dom_struct;
-use servo_url::MutableOrigin;
 
 /// Represents a dissimilar-origin `Location` that exists in another script thread.
 ///
@@ -46,11 +45,6 @@ impl DissimilarOriginLocation {
             DissimilarOriginLocationBinding::Wrap,
         )
     }
-
-    #[allow(dead_code)]
-    pub fn origin(&self) -> &MutableOrigin {
-        self.window.origin()
-    }
 }
 
 impl DissimilarOriginLocationMethods for DissimilarOriginLocation {

components/script/dom/dissimilaroriginwindow.rs

@@ -5,7 +5,6 @@
 use crate::dom::bindings::codegen::Bindings::DissimilarOriginWindowBinding;
 use crate::dom::bindings::codegen::Bindings::DissimilarOriginWindowBinding::DissimilarOriginWindowMethods;
 use crate::dom::bindings::error::{Error, ErrorResult};
-use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::structuredclone::StructuredCloneData;
@@ -20,7 +19,6 @@ use js::rust::HandleValue;
 use msg::constellation_msg::PipelineId;
 use script_traits::ScriptMsg;
 use servo_url::ImmutableOrigin;
-use servo_url::MutableOrigin;
 use servo_url::ServoUrl;
 
 /// Represents a dissimilar-origin `Window` that exists in another script thread.
@@ -71,10 +69,6 @@ impl DissimilarOriginWindow {
         unsafe { DissimilarOriginWindowBinding::Wrap(cx, win) }
     }
 
-    pub fn origin(&self) -> &MutableOrigin {
-        self.upcast::<GlobalScope>().origin()
-    }
-
     pub fn window_proxy(&self) -> DomRoot<WindowProxy> {
         DomRoot::from_ref(&*self.window_proxy)
     }

components/script/dom/document.rs

@@ -473,10 +473,6 @@ impl Document {
         self.https_state.set(https_state);
     }
 
-    pub fn is_completely_loaded(&self) -> bool {
-        self.completely_loaded.get()
-    }
-
     pub fn is_fully_active(&self) -> bool {
         self.activity.get() == DocumentActivity::FullyActive
     }

components/script/dom/element.rs

@@ -600,8 +600,6 @@ pub trait LayoutElementHelpers {
     fn local_name(&self) -> &LocalName;
     fn namespace(&self) -> &Namespace;
     fn get_lang_for_layout(&self) -> String;
-    fn get_checked_state_for_layout(&self) -> bool;
-    fn get_indeterminate_state_for_layout(&self) -> bool;
     fn get_state_for_layout(&self) -> ElementState;
     fn insert_selector_flags(&self, flags: ElementSelectorFlags);
     fn has_selector_flags(&self, flags: ElementSelectorFlags) -> bool;
@@ -1029,26 +1027,6 @@ impl LayoutElementHelpers for LayoutDom<Element> {
         }
     }
 
-    #[inline]
-    #[allow(unsafe_code)]
-    fn get_checked_state_for_layout(&self) -> bool {
-        // TODO option and menuitem can also have a checked state.
-        match self.downcast::<HTMLInputElement>() {
-            Some(input) => unsafe { input.checked_state_for_layout() },
-            None => false,
-        }
-    }
-
-    #[inline]
-    #[allow(unsafe_code)]
-    fn get_indeterminate_state_for_layout(&self) -> bool {
-        // TODO progress elements can also be matched with :indeterminate
-        match self.downcast::<HTMLInputElement>() {
-            Some(input) => unsafe { input.indeterminate_state_for_layout() },
-            None => false,
-        }
-    }
-
     #[inline]
     #[allow(unsafe_code)]
     fn get_state_for_layout(&self) -> ElementState {
@@ -3289,10 +3267,6 @@ impl Element {
         self.state.set(state);
     }
 
-    pub fn active_state(&self) -> bool {
-        self.state.get().contains(ElementState::IN_ACTIVE_STATE)
-    }
-
     /// <https://html.spec.whatwg.org/multipage/#concept-selector-active>
     pub fn set_active_state(&self, value: bool) {
         self.set_state(ElementState::IN_ACTIVE_STATE, value);
@@ -3356,18 +3330,10 @@ impl Element {
         }
     }
 
-    pub fn target_state(&self) -> bool {
-        self.state.get().contains(ElementState::IN_TARGET_STATE)
-    }
-
     pub fn set_target_state(&self, value: bool) {
         self.set_state(ElementState::IN_TARGET_STATE, value)
     }
 
-    pub fn fullscreen_state(&self) -> bool {
-        self.state.get().contains(ElementState::IN_FULLSCREEN_STATE)
-    }
-
     pub fn set_fullscreen_state(&self, value: bool) {
         self.set_state(ElementState::IN_FULLSCREEN_STATE, value)
     }