Skip to content

Commit d0d7f04

Browse files
committed
more fixup
1 parent 7829bf9 commit d0d7f04

File tree

4 files changed

+42
-60
lines changed

4 files changed

+42
-60
lines changed

scripts/build-prefixes.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,10 @@ impl Feature {
665665
if self.is_compatible(browsers) {
666666
return true
667667
}
668-
browsers.${browser} = None;
668+
#[allow(unused_assignments)]
669+
{
670+
browsers.${browser} = None;
671+
}
669672
}\n`).join(' ')}
670673
false
671674
}

src/compat.rs

Lines changed: 36 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ pub enum Feature {
100100
ImageSet,
101101
InOutOfRange,
102102
IndeterminatePseudo,
103-
IsAnimatableSize,
104103
IsSelector,
105104
JapaneseFormalListStyleType,
106105
JapaneseInformalListStyleType,
@@ -5555,53 +5554,6 @@ impl Feature {
55555554
return false;
55565555
}
55575556
}
5558-
Feature::IsAnimatableSize => {
5559-
if let Some(version) = browsers.chrome {
5560-
if version < 1703936 {
5561-
return false;
5562-
}
5563-
}
5564-
if let Some(version) = browsers.edge {
5565-
if version < 786432 {
5566-
return false;
5567-
}
5568-
}
5569-
if let Some(version) = browsers.firefox {
5570-
if version < 1048576 {
5571-
return false;
5572-
}
5573-
}
5574-
if let Some(version) = browsers.ie {
5575-
if version < 720896 {
5576-
return false;
5577-
}
5578-
}
5579-
if let Some(version) = browsers.opera {
5580-
if version < 917504 {
5581-
return false;
5582-
}
5583-
}
5584-
if let Some(version) = browsers.safari {
5585-
if version < 458752 {
5586-
return false;
5587-
}
5588-
}
5589-
if let Some(version) = browsers.ios_saf {
5590-
if version < 458752 {
5591-
return false;
5592-
}
5593-
}
5594-
if let Some(version) = browsers.samsung {
5595-
if version < 66816 {
5596-
return false;
5597-
}
5598-
}
5599-
if let Some(version) = browsers.android {
5600-
if version < 263168 {
5601-
return false;
5602-
}
5603-
}
5604-
}
56055557
Feature::MaxContentSize => {
56065558
if let Some(version) = browsers.chrome {
56075559
if version < 1638400 {
@@ -5785,63 +5737,90 @@ impl Feature {
57855737
if self.is_compatible(browsers) {
57865738
return true;
57875739
}
5788-
browsers.android = None;
5740+
#[allow(unused_assignments)]
5741+
{
5742+
browsers.android = None;
5743+
}
57895744
}
57905745
if targets.chrome.is_some() {
57915746
browsers.chrome = targets.chrome;
57925747
if self.is_compatible(browsers) {
57935748
return true;
57945749
}
5795-
browsers.chrome = None;
5750+
#[allow(unused_assignments)]
5751+
{
5752+
browsers.chrome = None;
5753+
}
57965754
}
57975755
if targets.edge.is_some() {
57985756
browsers.edge = targets.edge;
57995757
if self.is_compatible(browsers) {
58005758
return true;
58015759
}
5802-
browsers.edge = None;
5760+
#[allow(unused_assignments)]
5761+
{
5762+
browsers.edge = None;
5763+
}
58035764
}
58045765
if targets.firefox.is_some() {
58055766
browsers.firefox = targets.firefox;
58065767
if self.is_compatible(browsers) {
58075768
return true;
58085769
}
5809-
browsers.firefox = None;
5770+
#[allow(unused_assignments)]
5771+
{
5772+
browsers.firefox = None;
5773+
}
58105774
}
58115775
if targets.ie.is_some() {
58125776
browsers.ie = targets.ie;
58135777
if self.is_compatible(browsers) {
58145778
return true;
58155779
}
5816-
browsers.ie = None;
5780+
#[allow(unused_assignments)]
5781+
{
5782+
browsers.ie = None;
5783+
}
58175784
}
58185785
if targets.ios_saf.is_some() {
58195786
browsers.ios_saf = targets.ios_saf;
58205787
if self.is_compatible(browsers) {
58215788
return true;
58225789
}
5823-
browsers.ios_saf = None;
5790+
#[allow(unused_assignments)]
5791+
{
5792+
browsers.ios_saf = None;
5793+
}
58245794
}
58255795
if targets.opera.is_some() {
58265796
browsers.opera = targets.opera;
58275797
if self.is_compatible(browsers) {
58285798
return true;
58295799
}
5830-
browsers.opera = None;
5800+
#[allow(unused_assignments)]
5801+
{
5802+
browsers.opera = None;
5803+
}
58315804
}
58325805
if targets.safari.is_some() {
58335806
browsers.safari = targets.safari;
58345807
if self.is_compatible(browsers) {
58355808
return true;
58365809
}
5837-
browsers.safari = None;
5810+
#[allow(unused_assignments)]
5811+
{
5812+
browsers.safari = None;
5813+
}
58385814
}
58395815
if targets.samsung.is_some() {
58405816
browsers.samsung = targets.samsung;
58415817
if self.is_compatible(browsers) {
58425818
return true;
58435819
}
5844-
browsers.samsung = None;
5820+
#[allow(unused_assignments)]
5821+
{
5822+
browsers.samsung = None;
5823+
}
58455824
}
58465825

58475826
false

src/media_query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,7 @@ mod tests {
18931893
targets::{Browsers, Targets},
18941894
};
18951895

1896-
fn parse(s: &str) -> MediaQuery {
1896+
fn parse(s: &str) -> MediaQuery<'_> {
18971897
let mut input = ParserInput::new(&s);
18981898
let mut parser = Parser::new(&mut input);
18991899
MediaQuery::parse_with_options(&mut parser, &ParserOptions::default()).unwrap()

src/properties/custom.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ impl<'a> std::hash::Hash for Token<'a> {
993993
/// Converts a floating point value into its mantissa, exponent,
994994
/// and sign components so that it can be hashed.
995995
fn integer_decode(v: f32) -> (u32, i16, i8) {
996-
let bits: u32 = unsafe { std::mem::transmute(v) };
996+
let bits: u32 = f32::to_bits(v);
997997
let sign: i8 = if bits >> 31 == 0 { 1 } else { -1 };
998998
let mut exponent: i16 = ((bits >> 23) & 0xff) as i16;
999999
let mantissa = if exponent == 0 {

0 commit comments

Comments
 (0)