Skip to content

Commit 9b379be

Browse files
committed
Auto merge of #143233 - dianqk:rollup-lcx3278, r=dianqk
Rollup of 14 pull requests Successful merges: - rust-lang/rust#142429 (`tests/ui`: A New Order [13/N]) - rust-lang/rust#142514 (Miri: handling of SNaN inputs in `f*::pow` operations) - rust-lang/rust#143066 (Use let chains in the new solver) - rust-lang/rust#143090 (Workaround for memory unsafety in third party DLLs) - rust-lang/rust#143118 (`tests/ui`: A New Order [15/N]) - rust-lang/rust#143159 (Do not freshen `ReError`) - rust-lang/rust#143168 (`tests/ui`: A New Order [16/N]) - rust-lang/rust#143176 (fix typos and improve clarity in documentation) - rust-lang/rust#143187 (Add my work email to mailmap) - rust-lang/rust#143190 (Use the `new` method for `BasicBlockData` and `Statement`) - rust-lang/rust#143195 (`tests/ui`: A New Order [17/N]) - rust-lang/rust#143196 (Port #[link_section] to the new attribute parsing infrastructure) - rust-lang/rust#143199 (Re-disable `tests/run-make/short-ice` on Windows MSVC again) - rust-lang/rust#143219 (Show auto trait and blanket impls for `!`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f201b1e + 29abb16 commit 9b379be

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/tests/ui.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ This directive takes comma-separated issue numbers as arguments, or `"unknown"`:
499499
- `//@ known-bug: rust-lang/chalk#123456`
500500
(allows arbitrary text before the `#`, which is useful when the issue is on another repo)
501501
- `//@ known-bug: unknown`
502-
(when there is no known issue yet; preferrably open one if it does not already exist)
502+
(when there is no known issue yet; preferably open one if it does not already exist)
503503

504504
Do not include [error annotations](#error-annotations) in a test with
505505
`known-bug`. The test should still include other normal directives and

0 commit comments

Comments
 (0)