Skip to content

Refactor InferenceFudger (née RegionFudger) - #59415

Merged
bors merged 16 commits into
rust-lang:masterfrom
varkor:values_since_snapshot
Mar 27, 2019
Merged

Refactor InferenceFudger (née RegionFudger)#59415
bors merged 16 commits into
rust-lang:masterfrom
varkor:values_since_snapshot

Conversation

@varkor

Copy link
Copy Markdown
Contributor
  • Rename RegionFudger (and related methods) to InferenceFudger.
  • Take integer and float inference variables into account.
  • Refactor types_created_since_snapshot and vars_created_since_snapshot with the new version of ena.
  • Some other refactoring in the area.

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2019
@rust-highfive

This comment has been minimized.

@varkorvarkor changed the title Refactor RegionFudgerRefactor InferenceFudger (née RegionFudger)Mar 25, 2019
@rust-highfive

This comment has been minimized.

Comment threadCargo.lock Outdated

@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 comments addressed (or wait for @nikomatsakis' review)

Comment threadsrc/librustc/infer/fudge.rs Outdated
@eddyb

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 2b4171bb967bb709326a4255f4dc06f70addae0b 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 Mar 26, 2019
@varkor

Copy link
Copy Markdown
ContributorAuthor

@bors p=1
This is blocking #59008.

@bors

bors commented Mar 27, 2019

Copy link
Copy Markdown
Collaborator

🔒 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 values_since_snapshot(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 values_since_snapshot --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
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustc_typeck/check/mod.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@borsbors 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 Mar 27, 2019
@varkor
varkorforce-pushed the values_since_snapshot branch from 2b4171b to 86d5a69CompareMarch 27, 2019 09:49
@varkor

Copy link
Copy Markdown
ContributorAuthor

@bors r=eddyb

@bors

bors commented Mar 27, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 86d5a69 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 27, 2019
@bors

bors commented Mar 27, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 86d5a69 with merge 33ef0ba...

bors added a commit that referenced this pull request Mar 27, 2019
Refactor InferenceFudger (née RegionFudger)
- Rename `RegionFudger` (and related methods) to `InferenceFudger`.
- Take integer and float inference variables into account.
- Refactor `types_created_since_snapshot` and `vars_created_since_snapshot` with the [new version of ena](rust-lang/ena#21).
- Some other refactoring in the area.
r? @eddyb
@bors

bors commented Mar 27, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing 33ef0ba to master...

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.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.

5 participants

@varkor@rust-highfive@eddyb@bors@bjorn3