Auto merge of #96824 - matthiaskrgr:rollup-silw3ki, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #96336 (Link to correct `as_mut` in docs for `pointer::as_ref`) - #96586 (Add aliases for std::fs::canonicalize) - #96667 (Add regression test) - #96671 (Remove hard links from `env::current_exe` security example) - #96726 (Add regression and bug tests) - #96756 (Enable compiler-docs by default for `compiler`, `codegen`, and `tools` profiles) - #96757 (Don't constantly rebuild clippy on `x test src/tools/clippy`.) - #96769 (Remove `adx_target_feature` feature from active features list) - #96777 (Make the test `check-pass` not to produce a JSON file) - #96822 (Enforce quote rule for JS source code) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
e612ce9ce5
24 changed files with 234 additions and 84 deletions
|
@ -1,4 +1,8 @@
|
|||
# These defaults are meant for contributors to the compiler who modify codegen or LLVM
|
||||
[build]
|
||||
# Contributors working on the compiler will probably expect compiler docs to be generated.
|
||||
compiler-docs = true
|
||||
|
||||
[llvm]
|
||||
# This enables debug-assertions in LLVM,
|
||||
# catching logic errors in codegen much earlier in the process.
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
# These defaults are meant for contributors to the compiler who do not modify codegen or LLVM
|
||||
[build]
|
||||
# Contributors working on the compiler will probably expect compiler docs to be generated.
|
||||
compiler-docs = true
|
||||
|
||||
[rust]
|
||||
# This enables `RUSTC_LOG=debug`, avoiding confusing situations
|
||||
# where adding `debug!()` appears to do nothing.
|
||||
|
|
|
@ -14,6 +14,8 @@ download-rustc = "if-unchanged"
|
|||
[build]
|
||||
# Document with the in-tree rustdoc by default, since `download-rustc` makes it quick to compile.
|
||||
doc-stage = 2
|
||||
# Contributors working on tools will probably expect compiler docs to be generated, so they can figure out how to use the API.
|
||||
compiler-docs = true
|
||||
|
||||
[llvm]
|
||||
# Will download LLVM from CI if available on your platform.
|
||||
|
|
|
@ -664,8 +664,6 @@ impl Step for Clippy {
|
|||
&[],
|
||||
);
|
||||
|
||||
// clippy tests need to know about the stage sysroot
|
||||
cargo.env("SYSROOT", builder.sysroot(compiler));
|
||||
cargo.env("RUSTC_TEST_SUITE", builder.rustc(compiler));
|
||||
cargo.env("RUSTC_LIB_PATH", builder.rustc_libdir(compiler));
|
||||
let host_libs = builder.stage_out(compiler, Mode::ToolRustc).join(builder.cargo_dir());
|
||||
|
|
|
@ -250,6 +250,10 @@ pub fn prepare_tool_cargo(
|
|||
}
|
||||
}
|
||||
|
||||
// clippy tests need to know about the stage sysroot. Set them consistently while building to
|
||||
// avoid rebuilding when running tests.
|
||||
cargo.env("SYSROOT", builder.sysroot(compiler));
|
||||
|
||||
// if tools are using lzma we want to force the build script to build its
|
||||
// own copy
|
||||
cargo.env("LZMA_API_STATIC", "1");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue