Skip to content

miri-unleash tests: ensure they fire even with 'allow(const_err)'#71318

Merged
bors merged 2 commits intorust-lang:masterfrom
RalfJung:miri-unleash-cleanup
Apr 24, 2020
Merged

miri-unleash tests: ensure they fire even with 'allow(const_err)'#71318
bors merged 2 commits intorust-lang:masterfrom
RalfJung:miri-unleash-cleanup

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented Apr 19, 2020

This is easier with static than const so I switched some of them over.

@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 19, 2020

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Apr 19, 2020

r? @oli-obk @ecstatic-morse

RalfJung
RalfJung commented Apr 19, 2020
View reviewed changes
src/test/ui/consts/miri_unleashed/const_refers_to_static.rs Outdated
Copy link
Member Author

@RalfJung RalfJung Apr 19, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sometimes the error is "erroneous constant used", other times it is "evaluation of constant expression failed". I am not sure where the inconsistency is coming from. Maybe it is because in the latter case, promotion was involved?

oli-obk
oli-obk reviewed Apr 22, 2020
View reviewed changes
oli-obk
oli-obk reviewed Apr 22, 2020
View reviewed changes
@oli-obk
Copy link
Contributor

oli-obk commented Apr 22, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 22, 2020

📌 Commit 579d09eda91e71bd75d923e8795a13c41443ad8e has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2020
RalfJung
RalfJung commented Apr 22, 2020
View reviewed changes
src/test/ui/consts/miri_unleashed/mutable_const.rs Outdated
Copy link
Member Author

@RalfJung RalfJung Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there no way to normalize the messages that NOTE/WARN/ERROR match against? It did not seem to work here.

Copy link
Contributor

@oli-obk oli-obk Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, these can't be normalized

@bors
Copy link
Collaborator

bors commented Apr 23, 2020

☔ The latest upstream changes (presumably #71467) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 23, 2020
@RalfJung RalfJung force-pushed the miri-unleash-cleanup branch from 579d09e to 6b76b0e Compare April 23, 2020 19:25
@RalfJung
Copy link
Member Author

RalfJung commented Apr 23, 2020

Rebased.
@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Apr 23, 2020

📌 Commit 6b76b0e has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 23, 2020
@RalfJung RalfJung closed this Apr 23, 2020
@RalfJung RalfJung reopened this Apr 23, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Apr 23, 2020

GHA PR builders always "cancel" themselves it seems -- Azure builders are fine (Cc @pietroalbini)

@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 24, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2020
@bors
Auto merge of rust-lang#71509 - Dylan-DPC:rollup-n8s37rm, r=Dylan-DPC
0612568 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71235 (Tweak `'static` suggestion code)
 - rust-lang#71318 (miri-unleash tests: ensure they fire even with 'allow(const_err)')
 - rust-lang#71428 (Let compiletest recognize gdb 10.x)
 - rust-lang#71475 (Miri Frame: use mir::Location to represent position in function)
 - rust-lang#71476 (more compact way to adjust test sizes for Miri)

Failed merges:

r? @ghost
@bors bors merged commit 2846aa2 into rust-lang:master Apr 24, 2020
@RalfJung RalfJung deleted the miri-unleash-cleanup branch April 24, 2020 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@RalfJung @rust-highfive @oli-obk @bors @nikomatsakis