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

Use TLS to store a type context for pretty-printing types. #26351

Merged
merged 16 commits into from
Jun 19, 2015
Merged

Use TLS to store a type context for pretty-printing types. #26351

merged 16 commits into from
Jun 19, 2015

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Jun 16, 2015

Pre-requisite for splitting the type context into global and local parts.
The Repr and UserString traits were also replaced by Debug and Display.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@eddyb eddyb force-pushed the tls-tcx branch 2 times, most recently from 178a8da to a6c14b4 Compare June 16, 2015 22:24
@huonw
Copy link
Member

huonw commented Jun 16, 2015

cc @rust-lang/compiler

@jroesch
Copy link
Member

jroesch commented Jun 17, 2015

👍

@bors
Copy link
Contributor

bors commented Jun 18, 2015

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

@eddyb eddyb force-pushed the tls-tcx branch 4 times, most recently from dcd2f6b to 90d7dff Compare June 18, 2015 17:26
@nikomatsakis
Copy link
Contributor

wow, this is... pretty nice. r+ from me, modulo some comments:

  • when None would be returned
  • explain that the callback in 2445733 is there so we can ensure that the tcx is in tls

@eddyb
Copy link
Member Author

eddyb commented Jun 18, 2015

@bors r=nikomatsakis p=1

@bors
Copy link
Contributor

bors commented Jun 18, 2015

📌 Commit a4fef22 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 18, 2015

⌛ Testing commit a4fef22 with merge 9afe8c3...

@bors
Copy link
Contributor

bors commented Jun 18, 2015

💔 Test failed - auto-linux-64-x-android-t

@eddyb
Copy link
Member Author

eddyb commented Jun 18, 2015

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 18, 2015

📌 Commit 4f5a079 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 18, 2015

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Jun 18, 2015

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

@eddyb
Copy link
Member Author

eddyb commented Jun 18, 2015

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 18, 2015

📌 Commit 14ce64e has been approved by nikomatsakis

@eddyb eddyb mentioned this pull request Jun 18, 2015
Closed
@eddyb
Copy link
Member Author

eddyb commented Jun 18, 2015

@bors p=2

@bors
Copy link
Contributor

bors commented Jun 18, 2015

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

@eddyb
Copy link
Member Author

eddyb commented Jun 18, 2015

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 18, 2015

📌 Commit 6eed166 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 19, 2015

⌛ Testing commit 6eed166 with merge 012c6ff...

@bors
Copy link
Contributor

bors commented Jun 19, 2015

⌛ Testing commit 6eed166 with merge 8c0aa6d...

@alexcrichton
Copy link
Member

@bors: retry force clean

bors added a commit that referenced this pull request Jun 19, 2015
@bors
Auto merge of #26351 - eddyb:tls-tcx, r=nikomatsakis
e4efb47 
Pre-requisite for splitting the type context into global and local parts.
The `Repr` and `UserString` traits were also replaced by `Debug` and `Display`.
@bors
Copy link
Contributor

bors commented Jun 19, 2015

⌛ Testing commit 6eed166 with merge e4efb47...

@bors
Copy link
Contributor

bors commented Jun 19, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt

@bors bors merged commit 6eed166 into rust-lang:master Jun 19, 2015
This was referenced Jun 19, 2015
Closed
Merged
Merged
Closed
Merged
Closed
Closed
Merged
Merged
@eddyb eddyb deleted the tls-tcx branch June 19, 2015 23:03
@eddyb eddyb mentioned this pull request Jun 25, 2015
Merged
bors added a commit that referenced this pull request Jun 27, 2015
@bors
Auto merge of #26575 - eddyb:tycx, r=nikomatsakis
650566e 
Next step towards split local/global type contexts, after #26351.
cc @rust-lang/compiler @jroesch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@eddyb @rust-highfive @huonw @jroesch @bors @nikomatsakis @alexcrichton @pnkfelix