Commit 3d5fcdc

committed

Auto merge of #146185 - Zalathar:rollup-n14lyv6, r=Zalathar

Rollup of 24 pull requests Successful merges: - rust-lang/rust#140459 (Add `read_buf` equivalents for positioned reads) - rust-lang/rust#143725 (core: add Peekable::next_if_map) - rust-lang/rust#145209 (Stabilize `path_add_extension`) - rust-lang/rust#145342 (fix drop scope for `super let` bindings within `if let`) - rust-lang/rust#145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - rust-lang/rust#145827 (On unused binding or binding not present in all patterns, suggest potential typo of unit struct/variant or const) - rust-lang/rust#145932 (Allow `inline(always)` with a target feature behind a unstable feature `target_feature_inline_always`.) - rust-lang/rust#145962 (Ensure we emit an allocator shim when only some crate types need one) - rust-lang/rust#145963 (Add LSX accelerated implementation for source file analysis) - rust-lang/rust#146054 (add `#[must_use]` to `array::repeat`) - rust-lang/rust#146090 (Derive `PartialEq` for `InvisibleOrigin`) - rust-lang/rust#146112 (don't uppercase error messages) - rust-lang/rust#146120 (Correct typo in `rustc_errors` comment) - rust-lang/rust#146124 (Test `rustc-dev` in `distcheck`) - rust-lang/rust#146127 (Rename `ToolRustc` to `ToolRustcPrivate`) - rust-lang/rust#146131 (rustdoc-search: add test case for indexing every item type) - rust-lang/rust#146134 (llvm: nvptx: Layout update to match LLVM) - rust-lang/rust#146136 (docs(std): add missing closing code block fences in doc comments) - rust-lang/rust#146137 (Disallow frontmatter in `--cfg` and `--check-cfg` arguments) - rust-lang/rust#146140 (compiletest: cygwin follows windows in using PATH for dynamic libraries) - rust-lang/rust#146150 (fix(rustdoc): match rustc `--emit` precedence ) - rust-lang/rust#146155 (Make bootstrap self test parallel) - rust-lang/rust#146161 ([rustdoc] Uncomment code to add scraped rustdoc examples in loaded paths) - rust-lang/rust#146172 (triagebot: configure some pings when certain attributes are used) r? `@ghost` `@rustbot` modify labels: rollup

2 parents a013b4d + b0569c8 commit 3d5fcdcCopy full SHA for 3d5fcdc

File tree

1 file changed

-5

lines changed

src/building/bootstrapping
- writing-tools-in-bootstrap.md

1 file changed

-5

lines changed

`‎src/building/bootstrapping/writing-tools-in-bootstrap.md‎`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,8 @@ There are three types of tools you can write in bootstrap:`
`11`	`11`	`Use this for tools that rely on the locally built std. The output goes into the "stageN-tools" directory.`
`12`	`12`	This mode is rarely used, mainly for `compiletest` which requires `libtest`.
`13`	`13`
`14`		-- `Mode::ToolRustc`
`15`		- Use this for tools that depend on both the locally built `rustc` and the target `std`. This is more complex than
`16`		- the other modes because the tool must be built with the same compiler used for `rustc` and placed in the "stageN-tools"
`17`		- directory. When you choose `Mode::ToolRustc`, `ToolBuild` implementation takes care of this automatically.
`18`		- If you need to use the builder’s compiler for something specific, you can get it from `ToolBuildResult`, which is
	`14`	+- `Mode::ToolRustcPrivate`
	`15`	+ Use this for tools that use the `rustc_private` mechanism, and thus depend on the locally built `rustc` and its rlib artifacts. This is more complex than the other modes because the tool must be built with the same compiler used for `rustc` and placed in the "stageN-tools" directory. When you choose `Mode::ToolRustcPrivate`, `ToolBuild` implementation takes care of this automatically. If you need to use the builder’s compiler for something specific, you can get it from `ToolBuildResult`, which is
`19`	`16`	returned by the tool's [`Step`].
`20`	`17`
`21`	`18`	Regardless of the tool type you must return `ToolBuildResult` from the tool’s [`Step`] implementation and use `ToolBuild` inside it.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3d5fcdc

File tree

1 file changed

1 file changed

`‎src/building/bootstrapping/writing-tools-in-bootstrap.md‎`

0 commit comments