diff options
| author | bors <bors@rust-lang.org> | 2020-04-27 22:49:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-27 22:49:05 +0000 |
| commit | c354509343b0a3a9b935cc18b2d4aa07da8d4261 (patch) | |
| tree | 0e1d9d4856c49bdd319b2a3b5c31e334da7940c4 /src/test/ui | |
| parent | 2d03399f53d28a8be645625376c0c9fbe601a01d (diff) | |
| parent | c890912da1742b5aae42c56e85758335de3af850 (diff) | |
Auto merge of #71620 - Dylan-DPC:rollup-9wgtisb, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #67841 (Add Read/Write::can_read/write_vectored) - #71524 (Minimize parameter of coerce_borrowed_pointer()) - #71558 (Cleanup and document `-Z tls-model` ) - #71578 (linkchecker: fix typo in main.rs) - #71596 (Fix broken link in `QPath` documentation) - #71604 (make recursive-zst test unleashed) - #71605 (No need to whitelist E0750 anymore) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui')
| -rw-r--r-- | src/test/ui/consts/recursive-zst-static.default.stderr (renamed from src/test/ui/consts/recursive-zst-static.stderr) | 6 | ||||
| -rw-r--r-- | src/test/ui/consts/recursive-zst-static.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/consts/recursive-zst-static.unleash.stderr | 21 |
3 files changed, 27 insertions, 3 deletions
diff --git a/src/test/ui/consts/recursive-zst-static.stderr b/src/test/ui/consts/recursive-zst-static.default.stderr index e21dcf691ab..d424b22f000 100644 --- a/src/test/ui/consts/recursive-zst-static.stderr +++ b/src/test/ui/consts/recursive-zst-static.default.stderr @@ -1,17 +1,17 @@ error[E0391]: cycle detected when const-evaluating `FOO` - --> $DIR/recursive-zst-static.rs:7:18 + --> $DIR/recursive-zst-static.rs:10:18 | LL | static FOO: () = FOO; | ^^^ | note: ...which requires const-evaluating `FOO`... - --> $DIR/recursive-zst-static.rs:7:1 + --> $DIR/recursive-zst-static.rs:10:1 | LL | static FOO: () = FOO; | ^^^^^^^^^^^^^^^^^^^^^ = note: ...which again requires const-evaluating `FOO`, completing the cycle note: cycle used when const-evaluating + checking `FOO` - --> $DIR/recursive-zst-static.rs:7:1 + --> $DIR/recursive-zst-static.rs:10:1 | LL | static FOO: () = FOO; | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/recursive-zst-static.rs b/src/test/ui/consts/recursive-zst-static.rs index 768df58e1e3..29a467c006a 100644 --- a/src/test/ui/consts/recursive-zst-static.rs +++ b/src/test/ui/consts/recursive-zst-static.rs @@ -1,3 +1,6 @@ +// revisions: default unleash +//[unleash]compile-flags: -Zunleash-the-miri-inside-of-you + // This test ensures that we do not allow ZST statics to initialize themselves without ever // actually creating a value of that type. This is important, as the ZST may have private fields // that users can reasonably expect to only get initialized by their own code. Thus unsafe code diff --git a/src/test/ui/consts/recursive-zst-static.unleash.stderr b/src/test/ui/consts/recursive-zst-static.unleash.stderr new file mode 100644 index 00000000000..d424b22f000 --- /dev/null +++ b/src/test/ui/consts/recursive-zst-static.unleash.stderr @@ -0,0 +1,21 @@ +error[E0391]: cycle detected when const-evaluating `FOO` + --> $DIR/recursive-zst-static.rs:10:18 + | +LL | static FOO: () = FOO; + | ^^^ + | +note: ...which requires const-evaluating `FOO`... + --> $DIR/recursive-zst-static.rs:10:1 + | +LL | static FOO: () = FOO; + | ^^^^^^^^^^^^^^^^^^^^^ + = note: ...which again requires const-evaluating `FOO`, completing the cycle +note: cycle used when const-evaluating + checking `FOO` + --> $DIR/recursive-zst-static.rs:10:1 + | +LL | static FOO: () = FOO; + | ^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0391`. |
