Skip to content
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

Remove the call that makes miri fail #70038

Merged
merged 5 commits into from
Mar 21, 2020
Merged

Remove the call that makes miri fail #70038

merged 5 commits into from
Mar 21, 2020

Conversation

DutchGhost
Copy link
Contributor

@DutchGhost DutchGhost commented Mar 16, 2020

@rust-highfive
Copy link
Collaborator

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 Mar 16, 2020
src/libcore/tests/mem.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

@RalfJung
Copy link
Member

@oli-obk we usually test these things in ui tests, right? Would you prefer this to become a ui test instead?

@oli-obk
Copy link
Contributor

oli-obk commented Mar 16, 2020

Yea a ui test would be more in line with our other tests

@nikomatsakis
Copy link
Contributor

I'm confused what's going on here -- but I'll pass the review over to @oli-obk

r? @oli-obk

@RalfJung RalfJung 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2020
@RalfJung
Copy link
Member

Okay, so @DutchGhost can you make this into a ui test? You can find existing tests in https://github.com/rust-lang/rust/tree/master/src/test/ui/consts.

@RalfJung
Copy link
Member

r? @RalfJung

@rust-highfive rust-highfive assigned RalfJung and unassigned oli-obk Mar 18, 2020
@@ -0,0 +1,22 @@
// run-pass
Copy link
Member

@RalfJung RalfJung Mar 19, 2020

Choose a reason for hiding this comment

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

Since this is a const-test with empty main, why is check-pass not sufficient?

Copy link
Member

Choose a reason for hiding this comment

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

@DutchGhost this blocks enabling leak checks again in https://github.com/RalfJung/miri-test-libstd, would be good if we could land this quickly. :)

@RalfJung
Copy link
Member

Thanks, that was quick. :)
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 20, 2020

📌 Commit d6f3a43 has been approved by RalfJung

@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 Mar 20, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 20, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 21, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 21, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2020
Rollup of 16 pull requests

Successful merges:

 - rust-lang#65097 (Make std::sync::Arc compatible with ThreadSanitizer)
 - rust-lang#69033 (Use generator resume arguments in the async/await lowering)
 - rust-lang#69997 (add `Option::{zip,zip_with}` methods under "option_zip" gate)
 - rust-lang#70038 (Remove the call that makes miri fail)
 - rust-lang#70058 (can_begin_literal_maybe_minus: `true` on `"-"? lit` NTs.)
 - rust-lang#70111 (BTreeMap: remove shared root)
 - rust-lang#70139 (add delay_span_bug to TransmuteSizeDiff, just to be sure)
 - rust-lang#70165 (Remove the erase regions MIR transform)
 - rust-lang#70166 (Derive PartialEq, Eq and Hash for RangeInclusive)
 - rust-lang#70176 (Add tests for rust-lang#58319 and rust-lang#65131)
 - rust-lang#70177 (Fix oudated comment for NamedRegionMap)
 - rust-lang#70184 (expand_include: set `.directory` to dir of included file.)
 - rust-lang#70187 (more clippy fixes)
 - rust-lang#70188 (Clean up E0439 explanation)
 - rust-lang#70189 (Abi::is_signed: assert that we are a Scalar)
 - rust-lang#70194 (#[must_use] on split_off())

Failed merges:

r? @ghost
@bors bors merged commit 45b10f6 into rust-lang:master Mar 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants