Skip to content

Commit

Permalink
clippy: fix some warnings in components/script (#31865)
Browse files Browse the repository at this point in the history
  • Loading branch information
ektuu committed Mar 26, 2024
1 parent 58f170c commit 188f3ca
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion components/script/dom/abstractworkerglobalscope.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/analysernode.rs
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions components/script/dom/animationevent.rs
Expand Up @@ -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(),
}
}
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions components/script/dom/attr.rs
Expand Up @@ -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;
Expand All @@ -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()
}

Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/audiobuffer.rs
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions components/script/dom/audiotrack.rs
Expand Up @@ -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)),
}
}

Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/audiotracklist.rs
Expand Up @@ -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),
}
}

Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/baseaudiocontext.rs
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/bindings/error.rs
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/bindings/interface.rs
Expand Up @@ -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
));
}
Expand Down

0 comments on commit 188f3ca

Please sign in to comment.