Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

No description provided.

@rust-highfive
Copy link
Contributor

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2019
@Mark-Simulacrum
Copy link
Member Author

r? @Centril perhaps?

@rust-highfive rust-highfive assigned Centril and unassigned eddyb Sep 25, 2019
@Centril
Copy link
Contributor

Centril commented Sep 25, 2019

Don't have enough context sorry :) r? @nikomatsakis

@eddyb
Copy link
Member

eddyb commented Sep 26, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 26, 2019

📌 Commit 4469bdd has been approved by eddyb

@bors bors 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 Sep 26, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 26, 2019
Remove stray references to the old global tcx
@bors
Copy link
Collaborator

bors commented Sep 26, 2019

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

@bors bors 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 Sep 26, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Sep 27, 2019

📌 Commit a1e21be has been approved by eddyb

@bors bors 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 Sep 27, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 27, 2019
Remove stray references to the old global tcx
@bors
Copy link
Collaborator

bors commented Sep 27, 2019

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

@bors bors 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 Sep 27, 2019
The non-global context was removed; there's only one context now. This
is a noop method that only serves to confuse readers -- remove it.
There's no longer two distinct gcx and tcx lifetimes which made this
necessary (or, at least, the code compiles -- it's possible we got
better at normalizing, but that seems unlikely).
@Mark-Simulacrum
Copy link
Member Author

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Sep 27, 2019

📌 Commit 4b23503 has been approved by eddyb

@bors bors 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 Sep 27, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 28, 2019
Remove stray references to the old global tcx
bors added a commit that referenced this pull request Sep 28, 2019
Rollup of 14 pull requests

Successful merges:

 - #63492 (Remove redundancy from the implementation of C variadics.)
 - #64703 (Docs: slice elements are equidistant)
 - #64745 (Include message on tests that should panic but do not)
 - #64781 (Remove stray references to the old global tcx)
 - #64794 (Remove unused DepTrackingMap)
 - #64802 (Account for tail expressions when pointing at return type)
 - #64809 (hir: Disallow `target_feature` on constants)
 - #64815 (Fix div_duration() marked as stable by mistake)
 - #64818 (update rtpSpawn's parameters type(It's prototype has been updated in libc))
 - #64830 (Thou shallt not `.abort_if_errors()`)
 - #64836 (Stabilize map_get_key_value feature)
 - #64845 (pin.rs: fix links to primitives in documentation)
 - #64847 (Upgrade env_logger to 0.7)
 - #64851 (Add mailmap entry for Dustin Bensing by request)

Failed merges:

 - #64824 (No StableHasherResult everywhere)

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 28, 2019
Remove stray references to the old global tcx
bors added a commit that referenced this pull request Sep 28, 2019
Rollup of 14 pull requests

Successful merges:

 - #64703 (Docs: slice elements are equidistant)
 - #64745 (Include message on tests that should panic but do not)
 - #64781 (Remove stray references to the old global tcx)
 - #64794 (Remove unused DepTrackingMap)
 - #64802 (Account for tail expressions when pointing at return type)
 - #64809 (hir: Disallow `target_feature` on constants)
 - #64815 (Fix div_duration() marked as stable by mistake)
 - #64818 (update rtpSpawn's parameters type(It's prototype has been updated in libc))
 - #64830 (Thou shallt not `.abort_if_errors()`)
 - #64836 (Stabilize map_get_key_value feature)
 - #64845 (pin.rs: fix links to primitives in documentation)
 - #64847 (Upgrade env_logger to 0.7)
 - #64851 (Add mailmap entry for Dustin Bensing by request)
 - #64859 (check_match: improve diagnostics for `let A = 2;` with `const A: i32 = 3`)

Failed merges:

r? @ghost
@bors bors merged commit 4b23503 into rust-lang:master Sep 28, 2019
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Sep 28, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Sep 28, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Sep 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

6 participants