mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
use self.0 instead of destructing single item tuple structs
This commit is contained in:
parent
68a8085a2f
commit
418842faf9
17 changed files with 38 additions and 58 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue