Skip to content

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
Contributor

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
Contributor

huonw commented Jun 16, 2015

cc @rust-lang/compiler

@jroesch
Copy link
Contributor

jroesch commented Jun 17, 2015

👍

@bors
Copy link
Collaborator

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
Collaborator

bors commented Jun 18, 2015

📌 Commit a4fef22 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Jun 18, 2015

⌛ Testing commit a4fef22 with merge 9afe8c3...

@bors
Copy link
Collaborator

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
Collaborator

bors commented Jun 18, 2015

📌 Commit 4f5a079 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Jun 18, 2015

🔒 Merge conflict

@bors
Copy link
Collaborator

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
Collaborator

bors commented Jun 18, 2015

📌 Commit 14ce64e has been approved by nikomatsakis

@eddyb
Copy link
Member Author

eddyb commented Jun 18, 2015

@bors p=2

@bors
Copy link
Collaborator

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
Collaborator

bors commented Jun 18, 2015

📌 Commit 6eed166 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Jun 19, 2015

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

@bors
Copy link
Collaborator

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
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
Collaborator

bors commented Jun 19, 2015

⌛ Testing commit 6eed166 with merge e4efb47...

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

Labels

None yet

8 participants