Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fe168de

Browse files
committed
Auto merge of #145043 - Zalathar:rollup-3dbvdrm, r=Zalathar
Rollup of 19 pull requests Successful merges: - rust-lang/rust#137831 (Tweak auto trait errors) - rust-lang/rust#138689 (add nvptx_target_feature) - rust-lang/rust#140267 (implement continue_ok and break_ok for ControlFlow) - rust-lang/rust#143028 (emit `StorageLive` and schedule `StorageDead` for `let`-`else`'s bindings after matching) - rust-lang/rust#143764 (lower pattern bindings in the order they're written and base drop order on primary bindings' order) - rust-lang/rust#143808 (Port `#[should_panic]` to the new attribute parsing infrastructure ) - rust-lang/rust#143906 (Miri: non-deterministic floating point operations in `foreign_items`) - rust-lang/rust#143929 (Mark all deprecation lints in name resolution as deny-by-default and report-in-deps) - rust-lang/rust#144133 (Stabilize const TypeId::of) - rust-lang/rust#144369 (Upgrade semicolon_in_expressions_from_macros from warn to deny) - rust-lang/rust#144439 (Introduce ModernIdent type to unify macro 2.0 hygiene handling) - rust-lang/rust#144473 (Address libunwind.a inconsistency issues in the bootstrap program) - rust-lang/rust#144601 (Allow `cargo fix` to partially apply `mismatched_lifetime_syntaxes`) - rust-lang/rust#144650 (Additional tce tests) - rust-lang/rust#144659 (bootstrap: refactor mingw dist and fix gnullvm) - rust-lang/rust#144682 (Stabilize `strict_overflow_ops`) - rust-lang/rust#145026 (Update books) - rust-lang/rust#145033 (Reimplement `print_region` in `type_name.rs`.) - rust-lang/rust#145040 (rustc-dev-guide subtree update) Failed merges: - rust-lang/rust#143857 (Port #[macro_export] to the new attribute parsing infrastructure) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c368c78 + 9c2d9bb commit fe168de

File tree

4 files changed

+28
-3
lines changed

4 files changed

+28
-3
lines changed

‎rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
383b9c447b61641e1f1a3850253944a897a60827
1+
6bcdcc73bd11568fd85f5a38b58e1eda054ad1cd

‎src/offload/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ First you need to clone and configure the Rust repository:
88
```bash
99
git clone git@github.com:rust-lang/rust
1010
cd rust
11-
./configure --enable-llvm-link-shared --release-channel=nightly --enable-llvm-assertions --enable-offload --enable-enzyme --enable-clang --enable-lld --enable-option-checking --enable-ninja --disable-docs
11+
./configure --enable-llvm-link-shared --release-channel=nightly --enable-llvm-assertions --enable-llvm-offload --enable-llvm-enzyme --enable-clang --enable-lld --enable-option-checking --enable-ninja --disable-docs
1212
```
1313

1414
Afterwards you can build rustc using:

‎src/overview.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,10 @@ the name `'tcx`, which means that something is tied to the lifetime of the
321321

322322
[`TyCtxt`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TyCtxt.html
323323

324+
For more information about queries in the compiler, see [the queries chapter][queries].
325+
326+
[queries]: ./query.md
327+
324328
### `ty::Ty`
325329

326330
Types are really important in Rust, and they form the core of a lot of compiler

‎src/tests/running.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,35 @@ coordinate running tests (see [src/bootstrap/src/core/build_steps/test.rs]).
342342
> **TODO**
343343
>
344344
> - Is there any support for using an iOS emulator?
345-
> - It's also unclear to me how the wasm or asm.js tests are run.
346345
347346
[armhf-gnu]: https://github.com/rust-lang/rust/tree/master/src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
348347
[QEMU]: https://www.qemu.org/
349348
[remote-test-client]: https://github.com/rust-lang/rust/tree/master/src/tools/remote-test-client
350349
[remote-test-server]: https://github.com/rust-lang/rust/tree/master/src/tools/remote-test-server
351350
[src/bootstrap/src/core/build_steps/test.rs]: https://github.com/rust-lang/rust/blob/master/src/bootstrap/src/core/build_steps/test.rs
352351

352+
## Testing tests on wasi (wasm32-wasip1)
353+
354+
Some tests are specific to wasm targets.
355+
To run theste tests, you have to pass `--target wasm32-wasip1` to `x test`.
356+
Additionally, you need the wasi sdk.
357+
Follow the install instructions from the [wasi sdk repository] to get a sysroot on your computer.
358+
On the [wasm32-wasip1 target support page] a minimum version is specified that your sdk must be able to build.
359+
Some cmake commands that take a while and give a lot of very concerning c++ warnings...
360+
Then, in `bootstrap.toml`, point to the sysroot like so:
361+
362+
```
363+
[target.wasm32-wasip1]
364+
wasi-root = "<wasi-sdk location>/build/sysroot/install/share/wasi-sysroot"
365+
```
366+
367+
In my case I git-cloned it next to my rust folder, so it was `../wasi-sdk/build/....`
368+
Now, tests should just run, you don't have to set up anything else.
369+
370+
[wasi sdk repository]: https://github.com/WebAssembly/wasi-sdk
371+
[wasm32-wasip1 target support page]: https://github.com/rust-lang/rust/blob/master/src/doc/rustc/src/platform-support/wasm32-wasip1.md#building-the-target.
372+
373+
353374
## Running rustc_codegen_gcc tests
354375

355376
First thing to know is that it only supports linux x86_64 at the moment. We will

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /