squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Enable -W semicolon_in_expressions_from_macros in bootstrap

Browse source 
Now that stdarch has been updated, we can do this without breaking the
build.
This commit is contained in:
Aaron Hill 2021-03-13 12:46:33 -05:00
parent 881c1ac408
commit 020d83d9f5
No known key found for this signature in database
GPG key ID: B4087E510E98B164
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/bootstrap.py
View file

@ -900,8 +900,8 @@ class RustBuild(object):
target_linker = self.get_toml("linker", build_section) target_linker = self.get_toml("linker", build_section)
if target_linker is not None: if target_linker is not None:
env["RUSTFLAGS"] += " -C linker=" + target_linker env["RUSTFLAGS"] += " -C linker=" + target_linker
# cfg(bootstrap): Add `-Wsemicolon_in_expressions_from_macros` after the next beta bump
env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes" env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes"
env["RUSTFLAGS"] += " -Wsemicolon_in_expressions_from_macros"
if self.get_toml("deny-warnings", "rust") != "false": if self.get_toml("deny-warnings", "rust") != "false":
env["RUSTFLAGS"] += " -Dwarnings" env["RUSTFLAGS"] += " -Dwarnings"

5
src/bootstrap/builder.rs
View file

@ -1270,12 +1270,7 @@ impl<'a> Builder<'a> {
// some code doesn't go through this `rustc` wrapper. // some code doesn't go through this `rustc` wrapper.
lint_flags.push("-Wrust_2018_idioms"); lint_flags.push("-Wrust_2018_idioms");
lint_flags.push("-Wunused_lifetimes"); lint_flags.push("-Wunused_lifetimes");
// cfg(bootstrap): unconditionally enable this warning after the next beta bump
// This is currently disabled for the stage1 libstd, since build scripts
// will end up using the bootstrap compiler (which doesn't yet support this lint)
if compiler.stage != 0 && mode != Mode::Std {
lint_flags.push("-Wsemicolon_in_expressions_from_macros"); lint_flags.push("-Wsemicolon_in_expressions_from_macros");
}
if self.config.deny_warnings { if self.config.deny_warnings {
lint_flags.push("-Dwarnings"); lint_flags.push("-Dwarnings");