aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/compositing/surface_map.rs3
-rw-r--r--components/gfx_traits/lib.rs6
-rw-r--r--components/layout/block.rs3
-rw-r--r--components/layout/opaque_node.rs3
-rw-r--r--components/net/fetch/cors_cache.rs7
-rw-r--r--components/profile_traits/mem.rs6
-rw-r--r--components/profile_traits/time.rs3
-rw-r--r--components/script/cors.rs7
-rw-r--r--components/script/dom/bindings/str.rs3
-rw-r--r--components/script/script_thread.rs10
-rw-r--r--components/script/task_source/dom_manipulation.rs5
-rw-r--r--components/script/task_source/file_reading.rs5
-rw-r--r--components/script/task_source/history_traversal.rs5
-rw-r--r--components/script/task_source/networking.rs5
-rw-r--r--components/script/task_source/user_interaction.rs5
-rw-r--r--components/style/dom.rs3
-rw-r--r--components/style/values.rs17
17 files changed, 38 insertions, 58 deletions
diff --git a/components/compositing/surface_map.rs b/components/compositing/surface_map.rs
index d5f0cfba2f7..97b10a0677e 100644
--- a/components/compositing/surface_map.rs
+++ b/components/compositing/surface_map.rs
@@ -29,8 +29,7 @@ struct SurfaceKey([i32; 2]);
impl Hash for SurfaceKey {
fn hash<H: Hasher>(&self, state: &mut H) {
- let SurfaceKey(ref bytes) = *self;
- bytes.hash(state);
+ self.0.hash(state);
}
}
diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs
index b7af8286af0..5833e847a91 100644
--- a/components/gfx_traits/lib.rs
+++ b/components/gfx_traits/lib.rs
@@ -140,8 +140,7 @@ pub struct Epoch(pub u32);
impl Epoch {
pub fn next(&mut self) {
- let Epoch(ref mut u) = *self;
- *u += 1;
+ self.0 += 1;
}
}
@@ -150,7 +149,6 @@ pub struct FrameTreeId(pub u32);
impl FrameTreeId {
pub fn next(&mut self) {
- let FrameTreeId(ref mut u) = *self;
- *u += 1;
+ self.0 += 1;
}
}
diff --git a/components/layout/block.rs b/components/layout/block.rs
index b987313b21f..a502611df3b 100644
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@@ -471,8 +471,7 @@ impl<'a> PreorderFlowTraversal for AbsoluteAssignBSizesTraversal<'a> {
return
}
- let AbsoluteAssignBSizesTraversal(ref layout_context) = *self;
- block.calculate_absolute_block_size_and_margins(*layout_context);
+ block.calculate_absolute_block_size_and_margins(&self.0);
}
}
diff --git a/components/layout/opaque_node.rs b/components/layout/opaque_node.rs
index 2b307288afa..8bde9e6cc09 100644
--- a/components/layout/opaque_node.rs
+++ b/components/layout/opaque_node.rs
@@ -38,7 +38,6 @@ impl OpaqueNodeMethods for OpaqueNode {
}
fn to_untrusted_node_address(&self) -> UntrustedNodeAddress {
- let OpaqueNode(addr) = *self;
- UntrustedNodeAddress(addr as *const c_void)
+ UntrustedNodeAddress(self.0 as *const c_void)
}
}
diff --git a/components/net/fetch/cors_cache.rs b/components/net/fetch/cors_cache.rs
index 63c62f37c23..27807e1e354 100644
--- a/components/net/fetch/cors_cache.rs
+++ b/components/net/fetch/cors_cache.rs
@@ -124,7 +124,7 @@ impl BasicCORSCache {
fn find_entry_by_header<'a>(&'a mut self, request: &CacheRequestDetails,
header_name: &str) -> Option<&'a mut CORSCacheEntry> {
self.cleanup();
- let BasicCORSCache(ref mut buf) = *self;
+ let ref mut buf = self.0;
buf.iter_mut().find(|e| match_headers(e, request) && e.header_or_method.match_header(header_name))
}
@@ -132,7 +132,7 @@ impl BasicCORSCache {
method: Method) -> Option<&'a mut CORSCacheEntry> {
// we can take the method from CORSRequest itself
self.cleanup();
- let BasicCORSCache(ref mut buf) = *self;
+ let ref mut buf = self.0;
buf.iter_mut().find(|e| match_headers(e, request) && e.header_or_method.match_method(&method))
}
}
@@ -190,8 +190,7 @@ impl CORSCache for BasicCORSCache {
fn insert(&mut self, entry: CORSCacheEntry) {
self.cleanup();
- let BasicCORSCache(ref mut buf) = *self;
- buf.push(entry);
+ self.0.push(entry);
}
}
diff --git a/components/profile_traits/mem.rs b/components/profile_traits/mem.rs
index 7b377a00385..794874581b9 100644
--- a/components/profile_traits/mem.rs
+++ b/components/profile_traits/mem.rs
@@ -33,8 +33,7 @@ impl ProfilerChan {
///
/// Panics if the send fails.
pub fn send(&self, msg: ProfilerMsg) {
- let ProfilerChan(ref c) = *self;
- c.send(msg).unwrap();
+ self.0.send(msg).unwrap();
}
/// Runs `f()` with memory profiling.
@@ -118,8 +117,7 @@ impl ReportsChan {
///
/// Panics if the send fails.
pub fn send(&self, report: Vec<Report>) {
- let ReportsChan(ref c) = *self;
- c.send(report).unwrap();
+ self.0.send(report).unwrap();
}
}
diff --git a/components/profile_traits/time.rs b/components/profile_traits/time.rs
index 8a673d4db0d..203d2953065 100644
--- a/components/profile_traits/time.rs
+++ b/components/profile_traits/time.rs
@@ -20,8 +20,7 @@ pub struct ProfilerChan(pub IpcSender<ProfilerMsg>);
impl ProfilerChan {
pub fn send(&self, msg: ProfilerMsg) {
- let ProfilerChan(ref c) = *self;
- c.send(msg).unwrap();
+ self.0.send(msg).unwrap();
}
}
diff --git a/components/script/cors.rs b/components/script/cors.rs
index b5ad670a38c..11312aba407 100644
--- a/components/script/cors.rs
+++ b/components/script/cors.rs
@@ -394,7 +394,7 @@ impl CORSCache {
header_name: &str)
-> Option<&'a mut CORSCacheEntry> {
self.cleanup();
- let CORSCache(ref mut buf) = *self;
+ let ref mut buf = self.0;
// Credentials are not yet implemented here
buf.iter_mut().find(|e| {
e.origin.scheme == request.origin.scheme && e.origin.host() == request.origin.host() &&
@@ -421,7 +421,7 @@ impl CORSCache {
-> Option<&'a mut CORSCacheEntry> {
// we can take the method from CORSRequest itself
self.cleanup();
- let CORSCache(ref mut buf) = *self;
+ let ref mut buf = self.0;
// Credentials are not yet implemented here
buf.iter_mut().find(|e| {
e.origin.scheme == request.origin.scheme && e.origin.host() == request.origin.host() &&
@@ -445,8 +445,7 @@ impl CORSCache {
fn insert(&mut self, entry: CORSCacheEntry) {
self.cleanup();
- let CORSCache(ref mut buf) = *self;
- buf.push(entry);
+ self.0.push(entry);
}
}
diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs
index 6276c2c19bd..f1de6297ceb 100644
--- a/components/script/dom/bindings/str.rs
+++ b/components/script/dom/bindings/str.rs
@@ -58,8 +58,7 @@ impl Into<Vec<u8>> for ByteString {
impl Hash for ByteString {
fn hash<H: Hasher>(&self, state: &mut H) {
- let ByteString(ref vec) = *self;
- vec.hash(state);
+ self.0.hash(state);
}
}
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 9cfc2627786..de3d6b5cae2 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -321,12 +321,11 @@ pub struct SendableMainThreadScriptChan(pub Sender<CommonScriptMsg>);
impl ScriptChan for SendableMainThreadScriptChan {
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
- let SendableMainThreadScriptChan(ref chan) = *self;
- chan.send(msg).map_err(|_| ())
+ self.0.send(msg).map_err(|_| ())
}
fn clone(&self) -> Box<ScriptChan + Send> {
- let SendableMainThreadScriptChan(ref chan) = *self;
+ let ref chan = self.0;
box SendableMainThreadScriptChan((*chan).clone())
}
}
@@ -345,12 +344,11 @@ pub struct MainThreadScriptChan(pub Sender<MainThreadScriptMsg>);
impl ScriptChan for MainThreadScriptChan {
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
- let MainThreadScriptChan(ref chan) = *self;
- chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
+ self.0.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
}
fn clone(&self) -> Box<ScriptChan + Send> {
- let MainThreadScriptChan(ref chan) = *self;
+ let ref chan = self.0;
box MainThreadScriptChan((*chan).clone())
}
}
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs
index d60ce7de93d..84ec1ca5e78 100644
--- a/components/script/task_source/dom_manipulation.rs
+++ b/components/script/task_source/dom_manipulation.rs
@@ -16,12 +16,11 @@ pub struct DOMManipulationTaskSource(pub Sender<MainThreadScriptMsg>);
impl TaskSource<DOMManipulationTask> for DOMManipulationTaskSource {
fn queue(&self, msg: DOMManipulationTask) -> Result<(), ()> {
- let DOMManipulationTaskSource(ref chan) = *self;
- chan.send(MainThreadScriptMsg::DOMManipulation(msg)).map_err(|_| ())
+ self.0.send(MainThreadScriptMsg::DOMManipulation(msg)).map_err(|_| ())
}
fn clone(&self) -> Box<TaskSource<DOMManipulationTask> + Send> {
- let DOMManipulationTaskSource(ref chan) = *self;
+ let ref chan = self.0;
box DOMManipulationTaskSource((*chan).clone())
}
}
diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs
index e4afad34b4b..a9813167e34 100644
--- a/components/script/task_source/file_reading.rs
+++ b/components/script/task_source/file_reading.rs
@@ -10,12 +10,11 @@ pub struct FileReadingTaskSource(pub Sender<MainThreadScriptMsg>);
impl ScriptChan for FileReadingTaskSource {
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
- let FileReadingTaskSource(ref chan) = *self;
- chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
+ self.0.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
}
fn clone(&self) -> Box<ScriptChan + Send> {
- let FileReadingTaskSource(ref chan) = *self;
+ let ref chan = self.0;
box FileReadingTaskSource((*chan).clone())
}
}
diff --git a/components/script/task_source/history_traversal.rs b/components/script/task_source/history_traversal.rs
index 0916c121345..d4fb64864a3 100644
--- a/components/script/task_source/history_traversal.rs
+++ b/components/script/task_source/history_traversal.rs
@@ -10,12 +10,11 @@ pub struct HistoryTraversalTaskSource(pub Sender<MainThreadScriptMsg>);
impl ScriptChan for HistoryTraversalTaskSource {
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
- let HistoryTraversalTaskSource(ref chan) = *self;
- chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
+ self.0.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
}
fn clone(&self) -> Box<ScriptChan + Send> {
- let HistoryTraversalTaskSource(ref chan) = *self;
+ let ref chan = self.0;
box HistoryTraversalTaskSource((*chan).clone())
}
}
diff --git a/components/script/task_source/networking.rs b/components/script/task_source/networking.rs
index 8ebeecdb965..29a5997475e 100644
--- a/components/script/task_source/networking.rs
+++ b/components/script/task_source/networking.rs
@@ -10,12 +10,11 @@ pub struct NetworkingTaskSource(pub Sender<MainThreadScriptMsg>);
impl ScriptChan for NetworkingTaskSource {
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
- let NetworkingTaskSource(ref chan) = *self;
- chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
+ self.0.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
}
fn clone(&self) -> Box<ScriptChan + Send> {
- let NetworkingTaskSource(ref chan) = *self;
+ let ref chan = self.0;
box NetworkingTaskSource((*chan).clone())
}
}
diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs
index 7912eac720d..a4a2549e63d 100644
--- a/components/script/task_source/user_interaction.rs
+++ b/components/script/task_source/user_interaction.rs
@@ -10,12 +10,11 @@ pub struct UserInteractionTaskSource(pub Sender<MainThreadScriptMsg>);
impl ScriptChan for UserInteractionTaskSource {
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
- let UserInteractionTaskSource(ref chan) = *self;
- chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
+ self.0.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
}
fn clone(&self) -> Box<ScriptChan + Send> {
- let UserInteractionTaskSource(ref chan) = *self;
+ let ref chan = self.0;
box UserInteractionTaskSource((*chan).clone())
}
}
diff --git a/components/style/dom.rs b/components/style/dom.rs
index 861cec599a2..7a332806c09 100644
--- a/components/style/dom.rs
+++ b/components/style/dom.rs
@@ -37,8 +37,7 @@ impl OpaqueNode {
/// Returns the address of this node, for debugging purposes.
#[inline]
pub fn id(&self) -> usize {
- let OpaqueNode(pointer) = *self;
- pointer
+ self.0
}
}
diff --git a/components/style/values.rs b/components/style/values.rs
index 69cd83309fc..f1e125142d1 100644
--- a/components/style/values.rs
+++ b/components/style/values.rs
@@ -1077,7 +1077,7 @@ pub mod specified {
impl ToCss for BorderRadiusSize {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
- let BorderRadiusSize(size) = *self;
+ let size = self.0;
try!(size.width.to_css(dest));
try!(dest.write_str(" "));
size.height.to_css(dest)
@@ -1133,8 +1133,7 @@ pub mod specified {
impl ToCss for Angle {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
- let Angle(value) = *self;
- write!(dest, "{}rad", value)
+ write!(dest, "{}rad", self.0)
}
}
@@ -1642,19 +1641,19 @@ pub mod computed {
#[inline]
fn to_computed_value<Cx: TContext>(&self, context: &Cx) -> BorderRadiusSize {
- let specified::BorderRadiusSize(s) = *self;
- let w = s.width.to_computed_value(context);
- let h = s.height.to_computed_value(context);
+ let size = self.0;
+ let w = size.width.to_computed_value(context);
+ let h = size.height.to_computed_value(context);
BorderRadiusSize(Size2D::new(w, h))
}
}
impl ::cssparser::ToCss for BorderRadiusSize {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
- let BorderRadiusSize(s) = *self;
- try!(s.width.to_css(dest));
+ let size = self.0;
+ try!(size.width.to_css(dest));
try!(dest.write_str("/"));
- s.height.to_css(dest)
+ size.height.to_css(dest)
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-03 16:20:09 +0000