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.

Sign up for GitHub

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

Jump to bottom

Add tests for Intptrcast when doing explicit casts #803

Merged
merged 9 commits into from
Jul 5, 2019
Merged

Add tests for Intptrcast when doing explicit casts #803

merged 9 commits into from
Jul 5, 2019

Conversation

pvdrz
Copy link
Contributor

@pvdrz pvdrz commented Jun 29, 2019

@pvdrz pvdrz changed the title Intptrcast explicit casts Add tests for Intptrcast when doing explicit casts Jun 30, 2019
RalfJung
RalfJung approved these changes Jun 30, 2019
View reviewed changes
Copy link
Member

@RalfJung RalfJung left a comment

Choose a reason for hiding this comment

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

Looking good!

Blocked on landing rust-lang/rust#62229.

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jun 30, 2019
@pvdrz
Copy link
Contributor Author

pvdrz commented Jul 3, 2019 •
edited
Loading

rust-lang/rust#62229 just landed

Edit: I closed and opened the PR to trigger CI :P

@pvdrz pvdrz closed this Jul 3, 2019
@pvdrz pvdrz reopened this Jul 3, 2019
@RalfJung
Copy link
Member

RalfJung commented Jul 3, 2019 •
edited
Loading

@christianpoveda you need to update the rust-version file. Closing and reopening just wastes CI time. ;)

@RalfJung RalfJung removed the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jul 3, 2019
@RalfJung
Copy link
Member

RalfJung commented Jul 3, 2019

I wonder if we will see rust-lang/rust#62347 on our CI here. Bors will tell. ;)

@bors
Copy link
Contributor

bors commented Jul 3, 2019

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

@RalfJung
Copy link
Member

RalfJung commented Jul 3, 2019

Thanks!

I'm afraid I introduced a merge conflict here, sorry. :/ Can you take care of that? Then I will r+.

@pvdrz
Copy link
Contributor Author

pvdrz commented Jul 3, 2019

I wonder if we will see rust-lang/rust#62347 on our CI here. Bors will tell. ;)

It happened. I am not sure why tho

@RalfJung
Copy link
Member

RalfJung commented Jul 3, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 3, 2019

📌 Commit 8dfb278 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jul 3, 2019

⌛ Testing commit 8dfb278 with merge fea220c...

bors added a commit that referenced this pull request Jul 3, 2019
@bors
Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…
fea220c 
…fJung

Add tests for Intptrcast when doing explicit casts

r? @RalfJung
@bors
Copy link
Contributor

bors commented Jul 3, 2019

💔 Test failed - checks-travis

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jul 4, 2019
@RalfJung
Copy link
Member

RalfJung commented Jul 4, 2019

Essentially blocked on rust-lang/rust#62245.

@bors
Copy link
Contributor

bors commented Jul 4, 2019

📌 Commit 802dcb7 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jul 4, 2019

⌛ Testing commit 802dcb7 with merge 58e6530...

bors added a commit that referenced this pull request Jul 4, 2019
@bors
Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…
58e6530 
…fJung

Add tests for Intptrcast when doing explicit casts

r? @RalfJung
@bors
Copy link
Contributor

bors commented Jul 4, 2019

💔 Test failed - checks-travis

@RalfJung RalfJung removed the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jul 5, 2019
@RalfJung RalfJung mentioned this pull request Jul 5, 2019
Merged
@RalfJung
Copy link
Member

RalfJung commented Jul 5, 2019

Temporarily disabling more stuff. It's messy, but I think having to land the changes for all the upcoming braking changes at once will be even more messy...

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2019

📌 Commit 9b58492 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jul 5, 2019

⌛ Testing commit 9b58492 with merge a72c005...

bors added a commit that referenced this pull request Jul 5, 2019
@bors
Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…
a72c005 
…fJung

Add tests for Intptrcast when doing explicit casts

r? @RalfJung
@oli-obk oli-obk mentioned this pull request Jul 5, 2019
Closed
10 tasks
@RalfJung
Copy link
Member

RalfJung commented Jul 5, 2019

sigh Windows still fails. :( We should have done this cast thing from the start, turns out the intptrcast we landed was very incomplete but we didn't notice, and now that bites us. :/

@bors
Copy link
Contributor

bors commented Jul 5, 2019

💥 Test timed out

@RalfJung
Copy link
Member

RalfJung commented Jul 5, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2019

📌 Commit 4d76dd1 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jul 5, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout intptrcast-explicit-casts (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self intptrcast-explicit-casts --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging tests/run-pass-noseed/ptr_offset.rs
Auto-merging src/shims/foreign_items.rs
CONFLICT (content): Merge conflict in src/shims/foreign_items.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Jul 5, 2019

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

@RalfJung
Copy link
Member

RalfJung commented Jul 5, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2019

📌 Commit 89696a4 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jul 5, 2019

⌛ Testing commit 89696a4 with merge 285fc0d...

bors added a commit that referenced this pull request Jul 5, 2019
@bors
Auto merge of #803 - christianpoveda:intptrcast-explicit-casts, r=Ral…
285fc0d 
…fJung

Add tests for Intptrcast when doing explicit casts

r? @RalfJung
@bors
Copy link
Contributor

bors commented Jul 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 285fc0d to master...

@bors bors merged commit 89696a4 into rust-lang:master Jul 5, 2019
@pvdrz pvdrz deleted the intptrcast-explicit-casts branch July 6, 2019 03:30
bors added a commit that referenced this pull request Jul 6, 2019
@bors
Auto merge of #826 - RalfJung:uninit, r=RalfJung
e4a98ea 
uninit intrinsic is gone

Finally. :D

However, to land this we'll need to fix the intptrcast issues that block #803.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pvdrz @RalfJung @bors