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

Migrate to the 2024 edition (#35755)

Browse source 
* Migrate to 2024 edition

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Allow unsafe_op_in_unsafe_fn lint

This lint warns by default in the 2024
edition, but is *way* too noisy for servo.

We might enable it in the future, but not now.

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Compile using the 2024 edition

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

---------

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
Simon Wülker 2025-03-13 11:28:11 +01:00 • committed by GitHub
parent eb2ca42824
commit bb0d08432e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 317 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/dom/mediadevices.rs
View file

@ -118,22 +118,20 @@ fn convert_constraints(js: &BooleanOrMediaTrackConstraints) -> Option<MediaTrack
match js {
BooleanOrMediaTrackConstraints::Boolean(false) => None,
BooleanOrMediaTrackConstraints::Boolean(true) => Some(Default::default()),
BooleanOrMediaTrackConstraints::MediaTrackConstraints(ref c) => {
Some(MediaTrackConstraintSet {
height: c.parent.height.as_ref().and_then(convert_culong),
width: c.parent.width.as_ref().and_then(convert_culong),
aspect: c.parent.aspectRatio.as_ref().and_then(convert_cdouble),
frame_rate: c.parent.frameRate.as_ref().and_then(convert_cdouble),
sample_rate: c.parent.sampleRate.as_ref().and_then(convert_culong),
})
},
BooleanOrMediaTrackConstraints::MediaTrackConstraints(c) => Some(MediaTrackConstraintSet {
height: c.parent.height.as_ref().and_then(convert_culong),
width: c.parent.width.as_ref().and_then(convert_culong),
aspect: c.parent.aspectRatio.as_ref().and_then(convert_cdouble),
frame_rate: c.parent.frameRate.as_ref().and_then(convert_cdouble),
sample_rate: c.parent.sampleRate.as_ref().and_then(convert_culong),
}),
}
}
fn convert_culong(js: &ConstrainULong) -> Option<Constrain<u32>> {
match js {
ConstrainULong::ClampedUnsignedLong(val) => Some(Constrain::Value(*val)),
ConstrainULong::ConstrainULongRange(ref range) => {
ConstrainULong::ConstrainULongRange(range) => {
if range.parent.min.is_some() || range.parent.max.is_some() {
Some(Constrain::Range(ConstrainRange {
min: range.parent.min,
@ -150,7 +148,7 @@ fn convert_culong(js: &ConstrainULong) -> Option<Constrain<u32>> {
fn convert_cdouble(js: &ConstrainDouble) -> Option<Constrain<f64>> {
match js {
ConstrainDouble::Double(val) => Some(Constrain::Value(**val)),
ConstrainDouble::ConstrainDoubleRange(ref range) => {
ConstrainDouble::ConstrainDoubleRange(range) => {
if range.parent.min.is_some() || range.parent.max.is_some() {
Some(Constrain::Range(ConstrainRange {
min: range.parent.min.map(|x| *x),