Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 16:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

use self.0 instead of destructing single item tuple structs

Browse source
This commit is contained in:
faineance 2016-03-27 11:50:08 +01:00
parent 68a8085a2f
commit 418842faf9
17 changed files with 38 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/compositing/surface_map.rs
View file

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

6
components/gfx_traits/lib.rs
View file

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

3
components/layout/block.rs
View file

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

3
components/layout/opaque_node.rs
View file

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

7
components/net/fetch/cors_cache.rs
View file

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

6
components/profile_traits/mem.rs
View file

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

3
components/profile_traits/time.rs
View file

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

7
components/script/cors.rs
View file

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

3
components/script/dom/bindings/str.rs
View file

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

10
components/script/script_thread.rs
View file

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

5
components/script/task_source/dom_manipulation.rs
View file

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

5
components/script/task_source/file_reading.rs
View file

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

5
components/script/task_source/history_traversal.rs
View file

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

5
components/script/task_source/networking.rs
View file

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

5
components/script/task_source/user_interaction.rs
View file

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

3
components/style/dom.rs
View file

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

17
components/style/values.rs
View file

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