Skip to content

Commit 3ac1147

Browse files
committed
Auto merge of #149013 - Zalathar:rollup-io1ddhc, r=Zalathar
Rollup of 11 pull requests Successful merges: - rust-lang/rust#148505 (add larger test for `proc_macro` `FromStr` implementations) - rust-lang/rust#148752 (Constify `ManuallyDrop::take`) - rust-lang/rust#148757 (Constify `mem::take`) - rust-lang/rust#148855 (Error if an autodiff user does not set lto=fat) - rust-lang/rust#148912 (add note to `lines` docs about empty str behavior) - rust-lang/rust#148958 (Run codegen tests on a 32-bit target in PR CI) - rust-lang/rust#148994 (Abi compatibility test cleanup) - rust-lang/rust#148999 (Tweak Motor OS linker preset, fix `remote-test-server` for Motor OS) - rust-lang/rust#149004 (compiletest: Avoid race condition in file deletion) - rust-lang/rust#149008 (triagebot: remove jsha from notifications for rustdoc HTML) - rust-lang/rust#149010 (compiletest: Remove the "wasm32-bare" alias for `wasm32-unknown-unknown`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a868f8a + 4d2e002 commit 3ac1147

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/tests/directives.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ Some examples of `X` in `ignore-X` or `only-X`:
141141
- OS: `android`, `emscripten`, `freebsd`, `ios`, `linux`, `macos`, `windows`,
142142
...
143143
- Environment (fourth word of the target triple): `gnu`, `msvc`, `musl`
144-
- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`.
145144
- Pointer width: `32bit`, `64bit`
146145
- Endianness: `endian-big`
147146
- Stage: `stage1`, `stage2`

0 commit comments

Comments
 (0)