8000 Rollup of 5 pull requests by Centril · Pull Request #67291 · rust-lang/rust · GitHub
[go: up one dir, main page]

Skip to content

Rollup of 5 pull requests #67291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0f47327
Remove i686-unknown-dragonfly target
tuxillo Dec 12, 2019
641ccd5
Fix signature of `__wasilibc_find_relpath`
alexcrichton Dec 12, 2019
8f3021b
Get active features dynamically by their `Symbol`
ecstatic-morse Dec 10, 2019
57959b2
Add feature gate for `const_loop`
ecstatic-morse Dec 10, 2019
8f59902
Put MIR checks for loops behind the feature flag
ecstatic-morse Dec 10, 2019
ee233c0
Restructue HIR const-checker to handle features with multiple gates
ecstatic-morse Dec 10, 2019
99e132d
Extend control flow basics tests with loops
ecstatic-morse Dec 11, 2019
1122404
Add qualif smoke tests for const loops
ecstatic-morse Dec 11, 2019
caa7c99
Bless unrelated tests with new help message
ecstatic-morse Dec 11, 2019
3325671
Bless modified tests
ecstatic-morse Dec 11, 2019
2add77d
Improve message when active feature indexing panics
ecstatic-morse Dec 11, 2019
a8e997c
Improve comment
ecstatic-morse Dec 11, 2019
a2a0774
Look for "unstable feature" error code in test
ecstatic-morse Dec 11, 2019
b3aecd0
Fix grammar in test description
ecstatic-morse Dec 11, 2019
2b5ae1c
Apply suggestions from review
8000 ecstatic-morse Dec 11, 2019
80581be
Replace `Index` impl with `enabled` method
ecstatic-morse Dec 11, 2019
34ce0ba
Use better name for local containing required feature gates
ecstatic-morse Dec 11, 2019
598bed6
Ensure test actually uses dataflow, not simulation
ecstatic-morse Dec 11, 2019
029725f
Use correct nightly version for feature
ecstatic-morse Dec 11, 2019
0f0bfc9
Document `Features::enabled`
ecstatic-morse Dec 12, 2019
faa52d1
Correctly mark things as `min_const_fn`
ecstatic-morse Dec 13, 2019
b65c6ec
Fix incorrect example code of OpenOptions::open
pjw91 Dec 13, 2019
f5e9bda
doc comments: Less attribute mimicking
petrochenkov Dec 7, 2019
d720440
Rollup merge of #67151 - petrochenkov:docomm, r=estebank
Centril Dec 14, 2019
0e2fb73
Rollup merge of #67216 - ecstatic-morse:const-loop, r=oli-obk
Centril Dec 14, 2019
393ddd6
Rollup merge of #67255 - tuxillo:remove-i686-unknown-dragonfly, r=ale…
Centril Dec 14, 2019
18cbf24
Rollup merge of #67267 - alexcrichton:update-wasi-libc, r=Dylan-DPC
Centril Dec 14, 2019
389aa5f
Rollup merge of #67282 - pjw91:patch-1, r=Dylan-DPC
Centril Dec 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bless unrelated tests with new help message
  • Loading branch information
ecstatic-morse committed Dec 13, 2019
commit caa7c99172a858d3f00d893328446420c7b6856b
7 changes: 5 additions & 2 deletions src/test/ui/closures/issue-52437.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ error: invalid label name `'static`
LL | [(); &(&'static: loop { |x| {}; }) as *const _ as usize]
| ^^^^^^^

error[E0744]: `loop` is not allowed in a `const`
error[E0658]: `loop` is not allowed in a `const`
--> $DIR/issue-52437.rs:2:13
|
LL | [(); &(&'static: loop { |x| {}; }) as *const _ as usize]
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable

error[E0282]: type annotations needed
--> $DIR/issue-52437.rs:2:30
Expand All @@ -18,5 +21,5 @@ LL | [(); &(&'static: loop { |x| {}; }) as *const _ as usize]

error: aborting due to 3 previous errors

Some errors have detailed explanations: E0282, E0744.
Some errors have detailed explanations: E0282, E0658.
For more information about an error, try `rustc --explain E0282`.
8 changes: 6 additions & 2 deletions src/test/ui/consts/const-eval/infinite_loop.stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0744]: `while` is not allowed in a `const`
error[E0658]: `while` is not allowed in a `const`
--> $DIR/infinite_loop.rs:7:9
|
LL | / while n != 0 {
Expand All @@ -8,6 +8,10 @@ LL | |
LL | |
LL | | }
| |_________^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable
= help: add `#![feature(const_if_match)]` to the crate attributes to enable

error[E0658]: `if` is not allowed in a `const`
--> $DIR/infinite_loop.rs:9:17
Expand Down Expand Up @@ -39,5 +43,5 @@ LL | n = if n % 2 == 0 { n/2 } else { 3*n + 1 };

error: aborting due to 3 previous errors

Some errors have detailed explanations: E0080, E0658, E0744.
Some errors have detailed explanations: E0080, E0658.
For more information about an error, try `rustc --explain E0080`.
7 changes: 5 additions & 2 deletions src/test/ui/consts/const-eval/issue-52442.stderr
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
error[E0744]: `loop` is not allowed in a `const`
error[E0658]: `loop` is not allowed in a `const`
--> $DIR/issue-52442.rs:2:14
|
LL | [(); { &loop { break } as *const _ as usize } ];
| ^^^^^^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable

error[E0658]: casting pointers to integers in constants is unstable
--> $DIR/issue-52442.rs:2:13
Expand All @@ -21,5 +24,5 @@ LL | [(); { &loop { break } as *const _ as usize } ];

error: aborting due to 3 previous errors

Some errors have detailed explanations: E0080, E0658, E0744.
Some errors have detailed explanations: E0080, E0658.
For more information about an error, try `rustc --explain E0080`.
8 changes: 6 additions & 2 deletions src/test/ui/consts/const-eval/issue-52475.stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0744]: `while` is not allowed in a `const`
error[E0658]: `while` is not allowed in a `const`
--> $DIR/issue-52475.rs:6:9
|
LL | / while n < 5 {
Expand All @@ -7,6 +7,10 @@ LL | | n = (n + 1) % 5;
LL | | x = &0; // Materialize a new AllocId
LL | | }
| |_________^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable
= help: add `#![feature(const_if_match)]` to the crate attributes to enable

warning: Constant evaluating a complex constant, this might take some time
--> $DIR/issue-52475.rs:2:18
Expand All @@ -29,5 +33,5 @@ LL | n = (n + 1) % 5;

error: aborting due to 2 previous errors

Some errors have detailed explanations: E0080, E0744.
Some errors have detailed explanations: E0080, E0658.
For more information about an error, try `rustc --explain E0080`.
12 changes: 9 additions & 3 deletions src/test/ui/consts/const-eval/issue-62272.stderr
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
error[E0744]: `loop` is not allowed in a `const`
error[E0658]: `loop` is not allowed in a `const`
--> $DIR/issue-62272.rs:7:17
|
LL | const FOO: () = loop { break; };
| ^^^^^^^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable

error[E0744]: `loop` is not allowed in a `const`
error[E0658]: `loop` is not allowed in a `const`
--> $DIR/issue-62272.rs:10:20
|
LL | [FOO; { let x; loop { x = 5; break; } x }];
| ^^^^^^^^^^^^^^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0744`.
For more information about this error, try `rustc --explain E0658`.
8 changes: 6 additions & 2 deletions src/test/ui/consts/const-labeled-break.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
error[E0744]: `while` is not allowed in a `const`
error[E0658]: `while` is not allowed in a `const`
--> $DIR/const-labeled-break.rs:10:19
|
LL | const CRASH: () = 'a: while break 'a {};
| ^^^^^^^^^^^^^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable
= help: add `#![feature(const_if_match)]` to the crate attributes to enable

error: aborting due to previous error

For more information about this error, try `rustc --explain E0744`.
For more information about this error, try `rustc --explain E0658`.
7 changes: 5 additions & 2 deletions src/test/ui/consts/min_const_fn/loop_ice.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
error[E0744]: `loop` is not allowed in a `const fn`
error[E0658]: `loop` is not allowed in a `const fn`
--> $DIR/loop_ice.rs:2:5
|
LL | loop {}
| ^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable

error: aborting due to previous error

For more information about this error, try `rustc --explain E0744`.
For more information about this error, try `rustc --explain E0658`.
8 changes: 6 additions & 2 deletions src/test/ui/issues/issue-51714.stderr
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
error[E0744]: `while` is not allowed in a `const`
error[E0658]: `while` is not allowed in a `const`
--> $DIR/issue-51714.rs:11:17
|
LL | [(); return while let Some(n) = Some(0) {}];
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/52000
= help: add `#![feature(const_loop)]` to the crate attributes to enable
= help: add `#![feature(const_if_match)]` to the crate attributes to enable

error[E0572]: return statement outside of function body
--> $DIR/issue-51714.rs:2:14
Expand Down Expand Up @@ -30,5 +34,5 @@ LL | [(); return while let Some(n) = Some(0) {}];

error: aborting due to 5 previous errors

Some errors have detailed explanations: E0572, E0744.
Some errors have detailed explanations: E0572, E0658.
For more information about an error, try `rustc --explain E0572`.
0