Skip to content

Commit d349420

Browse files
committed
servo: Merge #6245 - Change not(ndebug) to debug_assertions (from mbrubeck:ndebug); r=SimonSapin
The name of this directive changed in rust-lang/rust#22980. Source-Repo: https://github.com/servo/servo Source-Revision: c724444ccb85551b5a0a581d673875ec9bce3d1f UltraBlame original commit: 3a8011945dea13f95829d2b1721f3a2a85e73392
1 parent b501aed commit d349420

File tree

4 files changed

+29
-39
lines changed

4 files changed

+29
-39
lines changed

servo/components/layout/layout_debug.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ if
127127
cfg
128128
!
129129
(
130-
not
131-
(
132-
ndebug
133-
)
130+
debug_assertions
134131
)
135132
{
136133
layout_debug
@@ -364,10 +361,7 @@ Scope
364361
[
365362
cfg
366363
(
367-
not
368-
(
369-
ndebug
370-
)
364+
debug_assertions
371365
)
372366
]
373367
impl

servo/components/script/script_task.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,11 +2817,10 @@ is
28172817
running
28182818
.
28192819
if
2820-
!
28212820
cfg
28222821
!
28232822
(
2824-
ndebug
2823+
debug_assertions
28252824
)
28262825
{
28272826
unsafe

servo/components/util/logical_geometry.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,10 @@ RTL
662662
[
663663
cfg
664664
(
665-
ndebug
665+
not
666+
(
667+
debug_assertions
668+
)
666669
)
667670
]
668671
#
@@ -683,10 +686,7 @@ DebugWritingMode
683686
[
684687
cfg
685688
(
686-
not
687-
(
688-
ndebug
689-
)
689+
debug_assertions
690690
)
691691
]
692692
#
@@ -711,7 +711,10 @@ WritingMode
711711
[
712712
cfg
713713
(
714-
ndebug
714+
not
715+
(
716+
debug_assertions
717+
)
715718
)
716719
]
717720
impl
@@ -769,10 +772,7 @@ DebugWritingMode
769772
[
770773
cfg
771774
(
772-
not
773-
(
774-
ndebug
775-
)
775+
debug_assertions
776776
)
777777
]
778778
impl
@@ -862,7 +862,10 @@ DebugWritingMode
862862
[
863863
cfg
864864
(
865-
ndebug
865+
not
866+
(
867+
debug_assertions
868+
)
866869
)
867870
]
868871
fn
@@ -898,10 +901,7 @@ formatter
898901
[
899902
cfg
900903
(
901-
not
902-
(
903-
ndebug
904-
)
904+
debug_assertions
905905
)
906906
]
907907
fn

servo/components/util/task_state.rs

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ TaskState
8282
[
8383
cfg
8484
(
85-
not
86-
(
87-
ndebug
88-
)
85+
debug_assertions
8986
)
9087
]
9188
pub
@@ -109,7 +106,10 @@ flag
109106
[
110107
cfg
111108
(
112-
ndebug
109+
not
110+
(
111+
debug_assertions
112+
)
113113
)
114114
]
115115
pub
@@ -131,10 +131,7 @@ true
131131
[
132132
cfg
133133
(
134-
not
135-
(
136-
ndebug
137-
)
134+
debug_assertions
138135
)
139136
]
140137
static
@@ -178,10 +175,7 @@ PAINT
178175
[
179176
cfg
180177
(
181-
not
182-
(
183-
ndebug
184-
)
178+
debug_assertions
185179
)
186180
]
187181
mod
@@ -501,7 +495,10 @@ x
501495
[
502496
cfg
503497
(
504-
ndebug
498+
not
499+
(
500+
debug_assertions
501+
)
505502
)
506503
]
507504
mod

0 commit comments

Comments
 (0)