Skip to content

fix Miri assignment sanity check - #70806

Merged
bors merged 3 commits into
rust-lang:masterfrom
RalfJung:miri-assignment-check
Apr 5, 2020
Merged

fix Miri assignment sanity check#70806
bors merged 3 commits into
rust-lang:masterfrom
RalfJung:miri-assignment-check

Conversation

@RalfJung

Copy link
Copy Markdown
Member

Thanks @eddyb for pointing me to the right APIs!

r? @eddyb
Fixes#70804

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 5, 2020
Comment on lines +233 to +234
// 2. Subtyping is used. While all normal lifetimes are erased, higher-ranked lifetime
// bounds with their late-bound regions are still around and can lead to type differences.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

"higher-ranked lifetime bounds" -> "higher-ranked types" (fn types and dyn Trait types are "higher-ranked" because they can "forall"-bind lifetimes - this is what the Binder wrapper indicates)

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Done. I also replaced "regions" by "lifetimes".

@eddybeddyb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

r=me with comment tweaked

@RalfJung

Copy link
Copy Markdown
MemberAuthor

@bors r=eddyb

@bors

bors commented Apr 5, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit e52a451 has been approved by eddyb

@borsbors 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 5, 2020
@RalfJungRalfJung changed the title Miri assignment checkfix Miri assignment sanity checkApr 5, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2020
Rollup of 5 pull requests
Successful merges:
- rust-lang#70558 (Fix some aliasing issues in Vec)
- rust-lang#70760 (docs: make the description of Result::map_or more clear)
- rust-lang#70769 (Miri: remove an outdated FIXME)
- rust-lang#70776 (clarify comment in RawVec::into_box)
- rust-lang#70806 (fix Miri assignment sanity check)
Failed merges:
r? @ghost
@bors
bors merged commit 31b8d65 into rust-lang:masterApr 5, 2020
@RalfJung
RalfJung deleted the miri-assignment-check branch April 5, 2020 16:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

Miri comparison sanity check is wrong

4 participants

@RalfJung@bors@eddyb@rust-highfive