Skip to content

Commit ea55d51

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 892e9f4 commit ea55d51

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
@@ -215,10 +215,7 @@ if
215215
cfg
216216
!
217217
(
218-
not
219-
(
220-
ndebug
221-
)
218+
debug_assertions
222219
)
223220
{
224221
layout_debug
@@ -482,10 +479,7 @@ Scope
482479
[
483480
cfg
484481
(
485-
not
486-
(
487-
ndebug
488-
)
482+
debug_assertions
489483
)
490484
]
491485
impl

servo/components/script/script_task.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3946,11 +3946,10 @@ is
39463946
running
39473947
.
39483948
if
3949-
!
39503949
cfg
39513950
!
39523951
(
3953-
ndebug
3952+
debug_assertions
39543953
)
39553954
{
39563955
unsafe

servo/components/util/logical_geometry.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,10 @@ ops
857857
[
858858
cfg
859859
(
860-
ndebug
860+
not
861+
(
862+
debug_assertions
863+
)
861864
)
862865
]
863866
#
@@ -878,10 +881,7 @@ DebugWritingMode
878881
[
879882
cfg
880883
(
881-
not
882-
(
883-
ndebug
884-
)
884+
debug_assertions
885885
)
886886
]
887887
#
@@ -906,7 +906,10 @@ WritingMode
906906
[
907907
cfg
908908
(
909-
ndebug
909+
not
910+
(
911+
debug_assertions
912+
)
910913
)
911914
]
912915
impl
@@ -964,10 +967,7 @@ DebugWritingMode
964967
[
965968
cfg
966969
(
967-
not
968-
(
969-
ndebug
970-
)
970+
debug_assertions
971971
)
972972
]
973973
impl
@@ -1057,7 +1057,10 @@ DebugWritingMode
10571057
[
10581058
cfg
10591059
(
1060-
ndebug
1060+
not
1061+
(
1062+
debug_assertions
1063+
)
10611064
)
10621065
]
10631066
fn
@@ -1093,10 +1096,7 @@ formatter
10931096
[
10941097
cfg
10951098
(
1096-
not
1097-
(
1098-
ndebug
1099-
)
1099+
debug_assertions
11001100
)
11011101
]
11021102
fn

servo/components/util/task_state.rs

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,7 @@ TaskState
193193
[
194194
cfg
195195
(
196-
not
197-
(
198-
ndebug
199-
)
196+
debug_assertions
200197
)
201198
]
202199
pub
@@ -220,7 +217,10 @@ flag
220217
[
221218
cfg
222219
(
223-
ndebug
220+
not
221+
(
222+
debug_assertions
223+
)
224224
)
225225
]
226226
pub
@@ -242,10 +242,7 @@ true
242242
[
243243
cfg
244244
(
245-
not
246-
(
247-
ndebug
248-
)
245+
debug_assertions
249246
)
250247
]
251248
static
@@ -289,10 +286,7 @@ PAINT
289286
[
290287
cfg
291288
(
292-
not
293-
(
294-
ndebug
295-
)
289+
debug_assertions
296290
)
297291
]
298292
mod
@@ -631,7 +625,10 @@ x
631625
[
632626
cfg
633627
(
634-
ndebug
628+
not
629+
(
630+
debug_assertions
631+
)
635632
)
636633
]
637634
mod

0 commit comments

Comments
 (0)