Skip to content

Commit c92cce7

Browse files
DKLoehrcopybara-github
authored andcommitted
Move warning suppression flag to default_warnings config
It seems like the was accidentally added to the treat_warnings_as_errors config instead of the regular suppression config, so the warning was turned back on for some local builds where that gn arg was disabled. Move it to the normal place for warning suppressions. [email protected] Bug: 427702057 Change-Id: I28c532071d627a9d98375e7b6e8806bdcf5fa4f1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6681120 Reviewed-by: Hans Wennborg <[email protected]> Auto-Submit: Devon Loehr <[email protected]> Commit-Queue: Devon Loehr <[email protected]> Cr-Commit-Position: refs/heads/main@{#1479887} NOKEYCHECK=True GitOrigin-RevId: 5fef29d673d43a3cb833087a886638dc7a4746f3
1 parent f8fa642 commit c92cce7

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

config/compiler/BUILD.gn

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,8 +1826,7 @@ config("libcxx_module") {
18261826
]
18271827

18281828
if (is_linux || is_chromeos) {
1829-
sysroot_modulemap =
1830-
rebase_path(SYSROOT_MODULEMAP, root_build_dir)
1829+
sysroot_modulemap = rebase_path(SYSROOT_MODULEMAP, root_build_dir)
18311830

18321831
cflags_cc += [ "-fmodule-map-file=" + sysroot_modulemap ]
18331832
}
@@ -1924,9 +1923,6 @@ config("treat_warnings_as_errors") {
19241923
# Note we apply the actual lint flags in config("compiler"). All warnings
19251924
# are suppressed in third-party crates.
19261925
rustflags = [ "-Dwarnings" ]
1927-
1928-
# TODO(crbug.com/424424323): Clean up and enable.
1929-
rustflags += [ "-Amismatched_lifetime_syntaxes" ]
19301926
}
19311927

19321928
# tot_warnings ----------------------------------------------------------------
@@ -2168,6 +2164,9 @@ config("default_warnings") {
21682164
# an error by default eventually; see
21692165
# https://github.com/rust-lang/rust/issues/71668
21702166
rustflags = [ "-Dunsafe_op_in_unsafe_fn" ]
2167+
2168+
# TODO(crbug.com/424424323): Clean up and enable.
2169+
rustflags += [ "-Amismatched_lifetime_syntaxes" ]
21712170
}
21722171

21732172
# prevent_unsafe_narrowing ----------------------------------------------------

0 commit comments

Comments
 (0)