Include miri in config.example.toml[build] # tools=

[dilyanpalauzov]

In the past, the default tools=[...] in config.toml included Miri. The default of building Miri was removed at #100134 and #102028. The latter is called “Do not build Miri by default”, and as it changes 1211 files obviously I do not follow what exactly it does.

In any case, as in rustc-1.80.1-src.tar.xz:config.example.toml[build] # tools = [ "cargo", "clippy", "rustdoc", "rustfmt", "rust-analyzer", "rust-analyzer-proc-macro-srv", "analysis", "src", "rust-demangler", # if profiler = true]

does not include miri, my understanding is that

$ ../configure --enable-optimize-llvm --enable-extended --llvm-root=/usr/local --enable-profiler --enable-llvm-link-shared --enable-sanitizers --enable-local-rust --disable-docs --target=x86_64-unknown-linux-gnu

and

$ ../configure --enable-optimize-llvm --enable-extended --llvm-root=/usr/local --enable-profiler --enable-llvm-link-shared --enable-sanitizers --enable-local-rust --disable-docs --target=x86_64-unknown-linux-gnu --tools=cargo,clippy,rustdoc,rustfmt,rust-analyzer,analysis,src,rust-demangler

should produce identical result (except for rust-analyzer-proc-macro-srv). But the first ./configure does lead to installing Miri, while the second skips installing Miri.

As my observation is that now Miri is built by default (is part of the implicit tools=[…]), in config.example.toml tools= should indclude miri.

To be precise the first ./configure I ran against rustc-1.79.0-src.tar.xz and the second against rustc-1.80.1-src.tar.xz.

[saethlin]

The default of building Miri was removed at #100134 and #102028

That PR shipped with Rust 1.66 so I'm not sure why you are linking it when you seem to be intending to report a change from Rust 1.79 to Rust 1.80.

[dilyanpalauzov]

I am not reporting a changbe between 1.79 and 1.80.

I am saying that old Rust versions built Miri by default (miri was in the implicit tools=[]), then it was removed from tools=[], and now miri is again in the implicit tools=[], but not in config.example.toml:tools=[...]

[RalfJung]

Miri was removed at #100134 and #102028. The latter is called “Do not build Miri by default”

The latter is called "Make miri a subtree instead of a submodule", which should give you an idea of why it changes so many files. ;)

I am saying that old Rust versions built Miri by default (miri was in the implicit tools=[]), then it was removed from tools=[], and now miri is again in the implicit tools=[], but not in config.example.toml:tools=[...]

Cc @rust-lang/bootstrap ; I don't know if this was a deliberate change or not or how the implicit "tools" array is even computed. Miri is a nightly-only tool so we probably do not want it to be built implicitly on stable.

[onur-ozkan]

Cc @rust-lang/bootstrap ; I don't know if this was a deliberate change or not or how the implicit "tools" array is even computed. Miri is a nightly-only tool so we probably do not want it to be built implicitly on stable.

For dev/nightly channels, we simply build every tool by default:

rust/src/bootstrap/src/core/build_steps/tool.rs

Lines 1029 to 1042 in f04f6ca

	fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
	let builder = run.builder;
	run.path($path).default_condition(
	builder.config.extended
	&& builder.config.tools.as_ref().map_or(
	// By default, on nightly/dev enable all tools, else only
	// build stable tools.
	$stable || builder.build.unstable_features(),
	// If `tools` is set, search list for this tool.
	|tools| {
	tools.iter().any(|tool| match tool.as_ref() {
	"clippy" => $tool_name == "clippy-driver",
	x => $tool_name == x,
	})

If channel isn't dev/nightly, we only build tools are are marked as stable=true here and (although cargo-miri is) Miri isn't one of them.

[RalfJung]

Okay so if the sample config.toml is supposed to show the default it should show both of these, presumably?

[onur-ozkan]

Okay so if the sample config.toml is supposed to show the default it should show both of these, presumably?

Done that in #129243 (a629a0b)