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

Implement intptrcast methods #779

Merged
merged 7 commits into from
Jun 26, 2019
Merged

Implement intptrcast methods #779

merged 7 commits into from
Jun 26, 2019

Conversation

pvdrz
Copy link
Contributor

@pvdrz pvdrz commented Jun 21, 2019 •
edited
Loading

cc #224

oli-obk
oli-obk reviewed Jun 21, 2019
View reviewed changes
src/lib.rs Outdated Show resolved Hide resolved
src/intptrcast.rs Outdated Show resolved Hide resolved
src/intptrcast.rs Outdated Show resolved Hide resolved
src/stacked_borrows.rs Outdated Show resolved Hide resolved
@RalfJung RalfJung mentioned this pull request Jun 22, 2019
Closed
8 tasks
@pvdrz
Copy link
Contributor Author

pvdrz commented Jun 22, 2019 •
edited
Loading

This is breaking the run-pass/hashmap.rs test, I'm not sure why. However, this started happening after the last commit (i.e. when forcing intptrcast for binary operations).

Edit: Apparently this only happens in my local build, CI seems to be ok.

oli-obk
oli-obk reviewed Jun 24, 2019
View reviewed changes
src/intptrcast.rs Outdated Show resolved Hide resolved
src/intptrcast.rs Outdated Show resolved Hide resolved
src/intptrcast.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/memory.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/memory.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Jun 24, 2019

lgtm, @RalfJung do you want another look?

RalfJung
RalfJung requested changes Jun 24, 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.

Looks good, but I got a bunch of comments. :)

src/lib.rs Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/memory.rs Outdated Show resolved Hide resolved
src/memory.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
@bors
Copy link
Collaborator

bors commented Jun 24, 2019

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

oli-obk
oli-obk requested changes Jun 25, 2019
View reviewed changes
src/intptrcast.rs Outdated Show resolved Hide resolved
src/intptrcast.rs Outdated Show resolved Hide resolved
@pvdrz
Copy link
Contributor Author

pvdrz commented Jun 25, 2019 •
edited
Loading

Why is this commented out?

Oh, my bad. I was testing if @oli-obk's code would pass or not and forgot to uncomment it. I'll amend it

RalfJung
RalfJung reviewed Jun 25, 2019
View reviewed changes
src/intptrcast.rs Outdated Show resolved Hide resolved
RalfJung
RalfJung reviewed Jun 25, 2019
View reviewed changes
src/intptrcast.rs Outdated Show resolved Hide resolved
RalfJung
RalfJung reviewed Jun 25, 2019
View reviewed changes
src/intptrcast.rs Outdated Show resolved Hide resolved
RalfJung
RalfJung reviewed Jun 25, 2019
View reviewed changes
src/intptrcast.rs Outdated Show resolved Hide resolved
@pvdrz pvdrz mentioned this pull request Jun 25, 2019
Closed
@pvdrz
Copy link
Contributor Author

pvdrz commented Jun 25, 2019

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Jun 25, 2019

@christianpoveda: 🔑 Insufficient privileges: Not in reviewers

RalfJung
RalfJung reviewed Jun 25, 2019
View reviewed changes
src/intptrcast.rs Outdated Show resolved Hide resolved
RalfJung
RalfJung approved these changes Jun 26, 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.

That was my last nit, r=me if @oli-obk agrees. :)

@oli-obk
Copy link
Contributor

oli-obk commented Jun 26, 2019

@bors r=RalfJung,oli-obk let's get this party started 🎉

@bors
Copy link
Collaborator

bors commented Jun 26, 2019

📌 Commit 7fbf8e5 has been approved by RalfJung,oli-obk

bors added a commit that referenced this pull request Jun 26, 2019
@bors
Auto merge of #779 - christianpoveda:intptrcast-model, r=RalfJung,oli…
945f007 
…-obk

Implement intptrcast methods

cc #224
@bors
Copy link
Collaborator

bors commented Jun 26, 2019

⌛ Testing commit 7fbf8e5 with merge 945f007...

@pvdrz
Copy link
Contributor Author

pvdrz commented Jun 26, 2019

Thank you, this one was really messy D:

@RalfJung RalfJung mentioned this pull request Jun 26, 2019
Merged
@bors
Copy link
Collaborator

bors commented Jun 26, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung,oli-obk
Pushing 945f007 to master...

@bors bors merged commit 7fbf8e5 into rust-lang:master Jun 26, 2019
@RalfJung
Copy link
Member

Awesome, thanks a lot @christianpoveda !

@pvdrz pvdrz deleted the intptrcast-model branch June 26, 2019 16:27
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 requested changes

@bjorn3 bjorn3 bjorn3 left review comments

@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.
5 participants
@pvdrz @oli-obk @bors @RalfJung @bjorn3