Skip to content

Make ExpnData fields krate and orig_id private#80648

Merged
bors merged 1 commit intorust-lang:masterfrom
Aaron1011:expn-data-private
Jan 7, 2021
Merged

Make ExpnData fields krate and orig_id private#80648
bors merged 1 commit intorust-lang:masterfrom
Aaron1011:expn-data-private

Conversation

@Aaron1011
Copy link
Contributor

@Aaron1011 Aaron1011 commented Jan 3, 2021

These fields are only used by hygiene serialized, and should not be
accessed by anything outside of rustc_span.

@Aaron1011
Make ExpnData fields krate and orig_id private
21b8f2e 
These fields are only used by hygiene serialized, and should not be
accessed by anything outside of `rustc_span`.
@rust-highfive
Copy link
Contributor

rust-highfive commented Jan 3, 2021

r? @matthewjasper

(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 Jan 3, 2021
@Aaron1011 Aaron1011 mentioned this pull request Jan 3, 2021
Merged
@spastorino spastorino mentioned this pull request Jan 5, 2021
Merged
@Aaron1011
Copy link
Contributor Author

Aaron1011 commented Jan 5, 2021

@petrochenkov Does this look good to you?

@petrochenkov petrochenkov self-assigned this Jan 5, 2021
@petrochenkov
Copy link
Contributor

petrochenkov commented Jan 5, 2021

@Aaron1011 I may miss pings among other mail, so it's better to assign me and set S-waiting-on-review if something needs my review.

@Aaron1011
Copy link
Contributor Author

Aaron1011 commented Jan 5, 2021

r? @petrochenkov

@petrochenkov
Copy link
Contributor

petrochenkov commented Jan 6, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 6, 2021

📌 Commit 21b8f2e has been approved by petrochenkov

@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 Jan 6, 2021
@bors
Copy link
Collaborator

bors commented Jan 6, 2021

⌛ Testing commit 21b8f2e with merge 792d0bfe6c9541ee9dbd856c66b00e86db636f5f...

@bors
Copy link
Collaborator

bors commented Jan 6, 2021

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 6, 2021
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Jan 6, 2021

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@Aaron1011
Copy link
Contributor Author

Aaron1011 commented Jan 6, 2021

@bors retry

@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 Jan 6, 2021
@bors
Copy link
Collaborator

bors commented Jan 6, 2021

⌛ Testing commit 21b8f2e with merge 9e2d21ee8fbb9cf5cfc01146bd1a3cefc5477336...

@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Jan 6, 2021

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
Build completed successfully in 0:00:47
+ /scripts/validate-toolstate.sh
Cloning into 'rust-toolstate'...
<Nothing changed>
error: book maintainer @carols10cents is not assignable in the rust-lang/rust repo

  To be assignable, a person needs to be explicitly listed as a
  collaborator in the repository settings. The simple way to
  fix this is to ask someone with 'admin' privileges on the repo
  to add the person or whole team as a collaborator with 'read'
  privileges. Those privileges don't grant any extra permissions
  so it's safe to apply them.
The build will fail due to this.

@bors
Copy link
Collaborator

bors commented Jan 6, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 6, 2021
@petrochenkov
Copy link
Contributor

petrochenkov commented Jan 6, 2021

error: book maintainer @carols10cents is not assignable in the rust-lang/rust repo

@bors retry

@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 Jan 6, 2021
@bors
Copy link
Collaborator

bors commented Jan 7, 2021

⌛ Testing commit 21b8f2e with merge bf5f306...

@bors
Copy link
Collaborator

bors commented Jan 7, 2021

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing bf5f306 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 7, 2021
@bors bors merged commit bf5f306 into rust-lang:master Jan 7, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 7, 2021
@bors bors mentioned this pull request Jan 7, 2021
Merged
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 16, 2021
@m-ou-se
Rollup merge of rust-lang#80732 - spastorino:trait-inheritance-self2,…
d2009f0 
… r=nikomatsakis

Allow Trait inheritance with cycles on associated types take 2

This reverts the revert of rust-lang#79209 and fixes the ICEs that's occasioned by that PR exposing some problems that are addressed in rust-lang#80648 and rust-lang#79811.
For easier review I'd say, check only the last commit, the first one is just a revert of the revert of rust-lang#79209 which was already approved.

This also could be considered part or the actual fix of rust-lang#79560 but I guess for that to be closed and fixed completely we would need to land rust-lang#80648 and rust-lang#79811 too.

r? `@nikomatsakis`
cc `@Aaron1011`
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 9, 2021
@Dylan-DPC
Rollup merge of rust-lang#80732 - spastorino:trait-inheritance-self2,…
44e526b 
… r=nikomatsakis

Allow Trait inheritance with cycles on associated types take 2

This reverts the revert of rust-lang#79209 and fixes the ICEs that's occasioned by that PR exposing some problems that are addressed in rust-lang#80648 and rust-lang#79811.
For easier review I'd say, check only the last commit, the first one is just a revert of the revert of rust-lang#79209 which was already approved.

This also could be considered part or the actual fix of rust-lang#79560 but I guess for that to be closed and fixed completely we would need to land rust-lang#80648 and rust-lang#79811 too.

r? `@nikomatsakis`
cc `@Aaron1011`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@spastorino spastorino spastorino approved these changes

Assignees

@petrochenkov petrochenkov

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.51.0

Development

Successfully merging this pull request may close these issues.

8 participants

@Aaron1011 @rust-highfive @petrochenkov @bors @rust-log-analyzer @spastorino @matthewjasper @rustbot