diff options
| author | bors <bors@rust-lang.org> | 2020-04-07 00:56:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-07 00:56:00 +0000 |
| commit | bf1f2eedda4fa02b7c9347dd849ed73ddd43dedc (patch) | |
| tree | 7d44f5c39ecc54b9da9bfc5a3f87c6b6a84eeb36 /src/test | |
| parent | 6dee5f1126dfd5c9314ee5ae9d9eb010e35ef257 (diff) | |
| parent | b9fe46d45b77870c82467c15a6df59899d2e22d8 (diff) | |
| download | rust-bf1f2eedda4fa02b7c9347dd849ed73ddd43dedc.tar.gz rust-bf1f2eedda4fa02b7c9347dd849ed73ddd43dedc.zip | |
Auto merge of #70865 - Dylan-DPC:rollup-jje2cuv, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #70612 (Add io::Write::write_all_vectored) - #70690 (Clean up E0501 explanation) - #70821 (expose suggestions::InferCtxtExt for clippy) - #70839 (clean up E0506 explanation) - #70859 (Move sanitize-inline-always test to sanitize directory) Failed merges: r? @ghost
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/sanitize/inline-always.rs (renamed from src/test/ui/sanitize-inline-always.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/sanitize/inline-always.stderr (renamed from src/test/ui/sanitize-inline-always.stderr) | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/sanitize-inline-always.rs b/src/test/ui/sanitize/inline-always.rs index 52dc5578180..52dc5578180 100644 --- a/src/test/ui/sanitize-inline-always.rs +++ b/src/test/ui/sanitize/inline-always.rs diff --git a/src/test/ui/sanitize-inline-always.stderr b/src/test/ui/sanitize/inline-always.stderr index 50b9474baa2..84c05af4cf8 100644 --- a/src/test/ui/sanitize-inline-always.stderr +++ b/src/test/ui/sanitize/inline-always.stderr @@ -1,12 +1,12 @@ warning: `no_sanitize` will have no effect after inlining - --> $DIR/sanitize-inline-always.rs:7:1 + --> $DIR/inline-always.rs:7:1 | LL | #[no_sanitize(address)] | ^^^^^^^^^^^^^^^^^^^^^^^ | = note: `#[warn(inline_no_sanitize)]` on by default note: inlining requested here - --> $DIR/sanitize-inline-always.rs:5:1 + --> $DIR/inline-always.rs:5:1 | LL | #[inline(always)] | ^^^^^^^^^^^^^^^^^ |