mirror of
https://github.com/servo/servo.git
synced 2025-06-11 01:50:10 +00:00
Update to rust 1.85 (#35628)
* Update to rust 1.85 This is needed for cargo-deny Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> * Upgrade crown Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> * Clippy fixes Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> * Re-upgrade cargo-deny to 0.18 Keeping it locked to 0.18 just in case they update their required rustc version again 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:
parent
d78f7b2d78
commit
be6765447d
36 changed files with 88 additions and 105 deletions
|
@ -188,7 +188,7 @@ impl FetchResponseListener for StylesheetContext {
|
|||
// else we risk applying the wrong stylesheet when responses come out-of-order.
|
||||
let is_stylesheet_load_applicable = self
|
||||
.request_generation_id
|
||||
.map_or(true, |gen| gen == link.get_request_generation_id());
|
||||
.is_none_or(|gen| gen == link.get_request_generation_id());
|
||||
if is_stylesheet_load_applicable {
|
||||
let shared_lock = document.style_shared_lock().clone();
|
||||
let sheet = Arc::new(Stylesheet::from_bytes(
|
||||
|
@ -375,7 +375,7 @@ impl StyleStylesheetLoader for StylesheetLoader<'_> {
|
|||
layer: ImportLayer,
|
||||
) -> Arc<Locked<ImportRule>> {
|
||||
// Ensure the supports conditions for this @import are true, if not, refuse to load
|
||||
if !supports.as_ref().map_or(true, |s| s.enabled) {
|
||||
if !supports.as_ref().is_none_or(|s| s.enabled) {
|
||||
return Arc::new(lock.wrap(ImportRule {
|
||||
url,
|
||||
stylesheet: ImportSheet::new_refused(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue