Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove usage of legacy numeric operations in script (#33095)

Browse source 
These operations are deprecated and might be removed
in a future rust version. Clippy is also complaining
about them.

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
Simon Wülker 2024-08-16 23:30:13 +02:00 • committed by GitHub
parent 09cac6430b
commit f0045a7686
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/animations.rs
View file

@ -422,7 +422,7 @@ impl Animations {
let active_duration = match animation.iteration_state { let active_duration = match animation.iteration_state {
KeyframesIterationState::Finite(_, max) => max * animation.duration, KeyframesIterationState::Finite(_, max) => max * animation.duration,
KeyframesIterationState::Infinite(_) => std::f64::MAX, KeyframesIterationState::Infinite(_) => f64::MAX,
}; };
// Calculate the `elapsed-time` property of the event and take the absolute // Calculate the `elapsed-time` property of the event and take the absolute

10
components/script/dom/htmlcollection.rs
View file

@ -25,7 +25,7 @@ pub trait CollectionFilter: JSTraceable {
fn filter<'a>(&self, elem: &'a Element, root: &'a Node) -> bool; fn filter<'a>(&self, elem: &'a Element, root: &'a Node) -> bool;
} }
/// An optional u32, using maxint to represent None. /// An optional u32, using u32::MAX to represent None.
/// It would be nicer just to use Option<u32> for this, but that would produce word /// It would be nicer just to use Option<u32> for this, but that would produce word
/// alignment issues since Option<u32> uses 33 bits. /// alignment issues since Option<u32> uses 33 bits.
#[derive(Clone, Copy, JSTraceable, MallocSizeOf)] #[derive(Clone, Copy, JSTraceable, MallocSizeOf)]
@ -35,7 +35,7 @@ struct OptionU32 {
impl OptionU32 { impl OptionU32 {
fn to_option(self) -> Option<u32> { fn to_option(self) -> Option<u32> {
if self.bits == u32::max_value() { if self.bits == u32::MAX {
None None
} else { } else {
Some(self.bits) Some(self.bits)
@ -43,14 +43,12 @@ impl OptionU32 {
} }
fn some(bits: u32) -> OptionU32 { fn some(bits: u32) -> OptionU32 {
assert_ne!(bits, u32::max_value()); assert_ne!(bits, u32::MAX);
OptionU32 { bits } OptionU32 { bits }
} }
fn none() -> OptionU32 { fn none() -> OptionU32 {
OptionU32 { OptionU32 { bits: u32::MAX }
bits: u32::max_value(),
}
} }
} }

6
components/script/script_runtime.rs
View file

@ -630,7 +630,7 @@ unsafe fn new_rt_and_cx_with_parent(
if pref!(js.baseline_jit.unsafe_eager_compilation.enabled) { if pref!(js.baseline_jit.unsafe_eager_compilation.enabled) {
0 0
} else { } else {
u32::max_value() u32::MAX
}, },
); );
JS_SetGlobalJitCompilerOption( JS_SetGlobalJitCompilerOption(
@ -639,7 +639,7 @@ unsafe fn new_rt_and_cx_with_parent(
if pref!(js.ion.unsafe_eager_compilation.enabled) { if pref!(js.ion.unsafe_eager_compilation.enabled) {
0 0
} else { } else {
u32::max_value() u32::MAX
}, },
); );
// TODO: handle js.discard_system_source.enabled // TODO: handle js.discard_system_source.enabled
@ -652,7 +652,7 @@ unsafe fn new_rt_and_cx_with_parent(
JSGCParamKey::JSGC_MAX_BYTES, JSGCParamKey::JSGC_MAX_BYTES,
in_range(pref!(js.mem.max), 1, 0x100) in_range(pref!(js.mem.max), 1, 0x100)
.map(|val| (val * 1024 * 1024) as u32) .map(|val| (val * 1024 * 1024) as u32)
.unwrap_or(u32::max_value()), .unwrap_or(u32::MAX),
); );
// NOTE: This is disabled above, so enabling it here will do nothing for now. // NOTE: This is disabled above, so enabling it here will do nothing for now.
JS_SetGCParameter( JS_SetGCParameter(

1
components/script/textinput.rs
View file

@ -8,7 +8,6 @@ use std::borrow::ToOwned;
use std::cmp::min; use std::cmp::min;
use std::default::Default; use std::default::Default;
use std::ops::{Add, AddAssign, Range}; use std::ops::{Add, AddAssign, Range};
use std::usize;
use keyboard_types::{Key, KeyState, Modifiers, ShortcutMatcher}; use keyboard_types::{Key, KeyState, Modifiers, ShortcutMatcher};
use unicode_segmentation::UnicodeSegmentation; use unicode_segmentation::UnicodeSegmentation;