Skip to content

Move SharedContext to context.rs#82963

Merged
bors merged 1 commit intorust-lang:masterfrom
camelid:move-sharedcontext
Apr 6, 2021
Merged

Move SharedContext to context.rs#82963
bors merged 1 commit intorust-lang:masterfrom
camelid:move-sharedcontext

Conversation

@camelid
Copy link
Member

@camelid camelid commented Mar 10, 2021

It is tightly connected to Context and is primarily used as a field in
Context. Thus, it should be next to Context.

@camelid camelid added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 10, 2021
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 10, 2021

r? @ollie27

(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 Mar 10, 2021
@camelid
Copy link
Member Author

camelid commented Mar 10, 2021

r? @GuillaumeGomez (not sure if Ollie is doing reviews)

@camelid
Copy link
Member Author

camelid commented Mar 10, 2021

Probably worth using git diff --color-moved=dimmed-zebra to review.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid camelid added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 22, 2021
@camelid camelid force-pushed the move-sharedcontext branch from c0e27d9 to 4cf7524 Compare March 22, 2021 02:52
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid camelid force-pushed the move-sharedcontext branch from 4cf7524 to e022936 Compare March 22, 2021 03:10
@camelid camelid removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 22, 2021
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Apr 2, 2021

Thanks!

@bors; r+ rollup

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Apr 2, 2021

Oh so ";" is stopping bors from doing anything. Interesting.

@bors; r+ rollup

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Apr 2, 2021

Oh come on...

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 2, 2021

📌 Commit e022936 has been approved by GuillaumeGomez

@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 Apr 2, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Apr 2, 2021
@JohnTitor
Rollup merge of rust-lang#82963 - camelid:move-sharedcontext, r=Guill…
9badf69 
…aumeGomez

Move `SharedContext` to `context.rs`

It is tightly connected to `Context` and is primarily used as a field in
`Context`. Thus, it should be next to `Context`.
@JohnTitor JohnTitor mentioned this pull request Apr 2, 2021
Closed
@JohnTitor
Copy link
Member

JohnTitor commented Apr 2, 2021

@bors r-
This needs a rebase to fix some compile errors: #83777 (comment)

@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 Apr 2, 2021
@camelid
Copy link
Member Author

camelid commented Apr 2, 2021

Oh so ";" is stopping bors from doing anything. Interesting.

You can also leave off the :, so bors r+ rollup (with an @ in front, but I left it off because bors does not ignore commands in inline code) will work.

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Apr 2, 2021

I know, but I like the ":". :)

@bors

This comment has been minimized.

Sign in to view
@camelid camelid force-pushed the move-sharedcontext branch from e022936 to 3f6b864 Compare April 6, 2021 02:20
@camelid camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 6, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid
Move SharedContext to context.rs
525646a 
It is tightly connected to `Context` and is primarily used as a field in
`Context`. Thus, it should be next to `Context`.
@camelid camelid force-pushed the move-sharedcontext branch from 3f6b864 to 525646a Compare April 6, 2021 02:28
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Apr 6, 2021

Let's start again then!

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 6, 2021

📌 Commit 525646a has been approved by GuillaumeGomez

@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 Apr 6, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 6, 2021
@Dylan-DPC
Rollup merge of rust-lang#82963 - camelid:move-sharedcontext, r=Guill…
861b0fb 
…aumeGomez

Move `SharedContext` to `context.rs`

It is tightly connected to `Context` and is primarily used as a field in
`Context`. Thus, it should be next to `Context`.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 6, 2021
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 6, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2021
@bors
Auto merge of rust-lang#83934 - Dylan-DPC:rollup-nw5dadn, r=Dylan-DPC
c051c5d 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#82963 (Move `SharedContext` to `context.rs`)
 - rust-lang#83829 (rustc_target: Rely on defaults more in target specs)
 - rust-lang#83895 (Add listing of lints (eg via `-W help`) to rustdoc)
 - rust-lang#83902 (Update LLVM to support more wasm simd ops)
 - rust-lang#83903 (Fix typo in TokenStream documentation)
 - rust-lang#83910 (Update cargo)
 - rust-lang#83920 (Fix HashMap/HashSet LLDB pretty-printer after hashbrown 0.11.0)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c92ac87 into rust-lang:master Apr 6, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 6, 2021
@camelid camelid deleted the move-sharedcontext branch April 6, 2021 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels

C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.53.0

Development

Successfully merging this pull request may close these issues.

8 participants

@camelid @rust-highfive @rust-log-analyzer @GuillaumeGomez @bors @JohnTitor @ollie27 @rustbot