aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/abstractworkerglobalscope.rs2
-rw-r--r--components/script/dom/analysernode.rs2
-rw-r--r--components/script/dom/animationevent.rs4
-rw-r--r--components/script/dom/attr.rs4
-rw-r--r--components/script/dom/audiobuffer.rs2
-rw-r--r--components/script/dom/audiotrack.rs10
-rw-r--r--components/script/dom/audiotracklist.rs2
-rw-r--r--components/script/dom/baseaudiocontext.rs2
-rw-r--r--components/script/dom/bindings/error.rs2
-rw-r--r--components/script/dom/bindings/interface.rs2
10 files changed, 16 insertions, 16 deletions
diff --git a/components/script/dom/abstractworkerglobalscope.rs b/components/script/dom/abstractworkerglobalscope.rs
index b0c580df7e4..434d9a96160 100644
--- a/components/script/dom/abstractworkerglobalscope.rs
+++ b/components/script/dom/abstractworkerglobalscope.rs
@@ -144,7 +144,7 @@ pub fn run_worker_event_loop<T, WorkerMsg, Event>(
}
// Step 3
for event in sequential {
- let _realm = enter_realm(&*worker_scope);
+ let _realm = enter_realm(worker_scope);
if !worker_scope.handle_event(event) {
// Shutdown
return;
diff --git a/components/script/dom/analysernode.rs b/components/script/dom/analysernode.rs
index 2d727f28e86..7df63366c30 100644
--- a/components/script/dom/analysernode.rs
+++ b/components/script/dom/analysernode.rs
@@ -184,7 +184,7 @@ impl AnalyserNodeMethods for AnalyserNode {
/// <https://webaudio.github.io/web-audio-api/#dom-analysernode-fftsize>
fn SetFftSize(&self, value: u32) -> Fallible<()> {
- if value > 32768 || value < 32 || (value & (value - 1) != 0) {
+ if !(32..=32768).contains(&value) || (value & (value - 1) != 0) {
return Err(Error::IndexSize);
}
self.engine.borrow_mut().set_fft_size(value as usize);
diff --git a/components/script/dom/animationevent.rs b/components/script/dom/animationevent.rs
index 648ed52690f..e57cb03c7d0 100644
--- a/components/script/dom/animationevent.rs
+++ b/components/script/dom/animationevent.rs
@@ -32,7 +32,7 @@ impl AnimationEvent {
AnimationEvent {
event: Event::new_inherited(),
animation_name: Atom::from(init.animationName.clone()),
- elapsed_time: init.elapsedTime.clone(),
+ elapsed_time: init.elapsedTime,
pseudo_element: init.pseudoElement.clone(),
}
}
@@ -78,7 +78,7 @@ impl AnimationEventMethods for AnimationEvent {
// https://drafts.csswg.org/css-animations/#interface-animationevent-attributes
fn ElapsedTime(&self) -> Finite<f32> {
- self.elapsed_time.clone()
+ self.elapsed_time
}
// https://drafts.csswg.org/css-animations/#interface-animationevent-attributes
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs
index 0096942ba9a..a17f3fb4c81 100644
--- a/components/script/dom/attr.rs
+++ b/components/script/dom/attr.rs
@@ -240,7 +240,7 @@ impl Attr {
#[allow(unsafe_code)]
pub trait AttrHelpersForLayout<'dom> {
fn value(self) -> &'dom AttrValue;
- fn as_str(self) -> &'dom str;
+ fn as_str(&self) -> &'dom str;
fn as_tokens(self) -> Option<&'dom [Atom]>;
fn local_name(self) -> &'dom LocalName;
fn namespace(self) -> &'dom Namespace;
@@ -254,7 +254,7 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
}
#[inline]
- fn as_str(self) -> &'dom str {
+ fn as_str(&self) -> &'dom str {
self.value()
}
diff --git a/components/script/dom/audiobuffer.rs b/components/script/dom/audiobuffer.rs
index 2e1b2bd6b06..1b6fbfd0e48 100644
--- a/components/script/dom/audiobuffer.rs
+++ b/components/script/dom/audiobuffer.rs
@@ -150,7 +150,7 @@ impl AudioBuffer {
}
fn restore_js_channel_data(&self, cx: JSContext) -> bool {
- let _ac = enter_realm(&*self);
+ let _ac = enter_realm(self);
for (i, channel) in self.js_channels.borrow_mut().iter().enumerate() {
if channel.is_initialized() {
// Already have data in JS array.
diff --git a/components/script/dom/audiotrack.rs b/components/script/dom/audiotrack.rs
index 829ed9b7207..b80819ecd3f 100644
--- a/components/script/dom/audiotrack.rs
+++ b/components/script/dom/audiotrack.rs
@@ -35,12 +35,12 @@ impl AudioTrack {
) -> AudioTrack {
AudioTrack {
reflector_: Reflector::new(),
- id: id.into(),
- kind: kind.into(),
- label: label.into(),
- language: language.into(),
+ id: id,
+ kind: kind,
+ label: label,
+ language: language,
enabled: Cell::new(false),
- track_list: DomRefCell::new(track_list.map(|t| Dom::from_ref(t))),
+ track_list: DomRefCell::new(track_list.map(Dom::from_ref)),
}
}
diff --git a/components/script/dom/audiotracklist.rs b/components/script/dom/audiotracklist.rs
index 27311de360b..93b1c5ec651 100644
--- a/components/script/dom/audiotracklist.rs
+++ b/components/script/dom/audiotracklist.rs
@@ -32,7 +32,7 @@ impl AudioTrackList {
AudioTrackList {
eventtarget: EventTarget::new_inherited(),
tracks: DomRefCell::new(tracks.iter().map(|track| Dom::from_ref(&**track)).collect()),
- media_element: media_element.map(|m| Dom::from_ref(m)),
+ media_element: media_element.map(Dom::from_ref),
}
}
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 799857abd74..cfbc2516925 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -181,7 +181,7 @@ impl BaseAudioContext {
/// which were taken and moved to the in-flight queue.
fn take_pending_resume_promises(&self, result: ErrorResult) {
let pending_resume_promises =
- mem::replace(&mut *self.pending_resume_promises.borrow_mut(), vec![]);
+ std::mem::take(&mut *self.pending_resume_promises.borrow_mut());
self.in_flight_resume_promises_queue
.borrow_mut()
.push_back((pending_resume_promises.into(), result));
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index 2e578b4d2f3..39f2da7dc1c 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -234,7 +234,7 @@ impl ErrorInfo {
if let Some(info) = ErrorInfo::from_dom_exception(object, cx) {
return Some(info);
}
- return None;
+ None
}
unsafe fn from_value(value: HandleValue, cx: *mut JSContext) -> ErrorInfo {
diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs
index bfd3312c0db..1f05de74998 100644
--- a/components/script/dom/bindings/interface.rs
+++ b/components/script/dom/bindings/interface.rs
@@ -502,7 +502,7 @@ fn define_name(cx: SafeJSContext, obj: HandleObject, name: &[u8]) {
*cx,
obj,
b"name\0".as_ptr() as *const libc::c_char,
- name.handle().into(),
+ name.handle(),
JSPROP_READONLY as u32
));
}