commit fef70663ddbb6a4d20fd9ce56b4cd1a84af09194 parent 91972b049d47813a35d3f1fc362da67d7ca6234e Author: Nico Burns <nico@nicoburns.com> Date: Mon, 15 Dec 2025 19:03:57 +0000 Bug 2005254: Use modern macro imports for debug_unreachable (r=firefox-style-system-reviewers,dshin) Differential Revision: https://phabricator.services.mozilla.com/D275841 Diffstat:
8 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/servo/components/style/lib.rs b/servo/components/style/lib.rs @@ -30,8 +30,6 @@ pub(crate) use cssparser; #[macro_use] extern crate bitflags; #[macro_use] -extern crate debug_unreachable; -#[macro_use] #[cfg(feature = "gecko")] extern crate gecko_profiler; #[cfg(feature = "gecko")] diff --git a/servo/components/style/properties/helpers/animated_properties.mako.rs b/servo/components/style/properties/helpers/animated_properties.mako.rs @@ -37,6 +37,7 @@ use crate::values::distance::{ComputeSquaredDistance, SquaredDistance}; use crate::values::generics::effects::Filter; use void::{self, Void}; use crate::properties_and_values::value::CustomAnimatedValue; +use debug_unreachable::debug_unreachable; /// Convert NonCustomCSSPropertyId to TransitionProperty #[cfg(feature = "gecko")] diff --git a/servo/components/style/properties/properties.mako.rs b/servo/components/style/properties/properties.mako.rs @@ -40,6 +40,7 @@ use super::{ LonghandIdSet, VariableDeclaration, CustomDeclaration, WideKeywordDeclaration, NonCustomPropertyIterator, }; +use debug_unreachable::debug_unreachable; <%! from collections import defaultdict diff --git a/servo/components/style/values/computed/length_percentage.rs b/servo/components/style/values/computed/length_percentage.rs @@ -44,6 +44,7 @@ use crate::values::specified::length::{FontBaseSize, LineHeightBase}; use crate::values::{specified, CSSFloat}; use crate::{Zero, ZeroNoPercent}; use app_units::Au; +use debug_unreachable::debug_unreachable; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use serde::{Deserialize, Serialize}; use std::fmt::{self, Write}; diff --git a/servo/components/style/values/specified/calc.rs b/servo/components/style/values/specified/calc.rs @@ -22,6 +22,7 @@ use crate::values::specified::length::{ContainerRelativeLength, ViewportPercenta use crate::values::specified::{self, Angle, Resolution, Time}; use crate::values::{serialize_number, serialize_percentage, CSSFloat, DashedIdent}; use cssparser::{match_ignore_ascii_case, CowRcStr, Parser, Token}; +use debug_unreachable::debug_unreachable; use smallvec::SmallVec; use std::cmp; use std::fmt::{self, Write}; diff --git a/servo/components/style/values/specified/length.rs b/servo/components/style/values/specified/length.rs @@ -27,6 +27,7 @@ use crate::values::CSSFloat; use crate::{Zero, ZeroNoPercent}; use app_units::AU_PER_PX; use cssparser::{match_ignore_ascii_case, Parser, Token}; +use debug_unreachable::debug_unreachable; use std::cmp; use std::fmt::{self, Write}; use style_traits::values::specified::AllowedNumericType; diff --git a/servo/components/style_derive/animate.rs b/servo/components/style_derive/animate.rs @@ -37,7 +37,10 @@ pub fn derive(mut input: DeriveInput) -> TokenStream { if needs_catchall_branch { // This ideally shouldn't be needed, but see // https://github.com/rust-lang/rust/issues/68867 - match_body.append_all(quote! { _ => unsafe { debug_unreachable!() } }); + match_body.append_all(quote! { _ => unsafe { + use ::debug_unreachable::debug_unreachable; + debug_unreachable!() + } }); } let name = &input.ident; diff --git a/servo/components/style_derive/compute_squared_distance.rs b/servo/components/style_derive/compute_squared_distance.rs @@ -39,7 +39,11 @@ pub fn derive(mut input: DeriveInput) -> TokenStream { if needs_catchall_branch { // This ideally shouldn't be needed, but see: // https://github.com/rust-lang/rust/issues/68867 - match_body.append_all(quote! { _ => unsafe { debug_unreachable!() } }); + + match_body.append_all(quote! { _ => unsafe { + use ::debug_unreachable::debug_unreachable; + debug_unreachable!() + } }); } let name = &input.ident;