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

Remove unneeded call to with_default_session_globals in rustdoc highlight #84953

Merged
merged 2 commits into from
May 7, 2021
Merged

Remove unneeded call to with_default_session_globals in rustdoc highlight #84953

merged 2 commits into from
May 7, 2021

Conversation

GuillaumeGomez
Copy link
Member

This was the origin of the Span bug in #84176.

cc @Aaron1011
r? @jyn514

@GuillaumeGomez GuillaumeGomez added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label May 5, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 5, 2021
@Aaron1011 Aaron1011 mentioned this pull request May 5, 2021
Closed
@jyn514
Copy link
Member

jyn514 commented May 5, 2021

This was added in #75775 - @matklad is there any particular reason you added it? Or just copy/pasting existing code?

On a meta note, I would be surprised if this doesn't regress some corner cases, but I think it should be fine to fix them as they come up, until we complete #75981.

I agree, and I don't expect this to be any more broken than the existing code.

Hey look, we were right 😆

@GuillaumeGomez
Copy link
Member Author

Who would have guessed? 😆

@matklad
Copy link
Member

matklad commented May 5, 2021

Don't rememeber. I guess, I migrated the old code piece by piece and just forgot to remove this when finally removing the ParseSess.

@jyn514
Copy link
Member

jyn514 commented May 5, 2021

r=me with CI passing

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

@bors: r=jyn514

@bors
Copy link
Contributor

bors commented May 5, 2021

📌 Commit 3c489a3 has been approved by jyn514

@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 May 5, 2021
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 5, 2021
Merged
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 5, 2021
@GuillaumeGomez
Rollup merge of rust-lang#84953 - GuillaumeGomez:remove-unneeded-with…
890adb8 
…_default_session_globals, r=jyn514

Remove unneeded call to with_default_session_globals in rustdoc highlight

This was the origin of the `Span` bug in rust-lang#84176.

cc `@Aaron1011`
r? `@jyn514`
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 5, 2021
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 5, 2021
@GuillaumeGomez
Rollup merge of rust-lang#84953 - GuillaumeGomez:remove-unneeded-with…
057bb46 
…_default_session_globals, r=jyn514

Remove unneeded call to with_default_session_globals in rustdoc highlight

This was the origin of the `Span` bug in rust-lang#84176.

cc ``@Aaron1011``
r? ``@jyn514``
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 5, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 6, 2021
@Dylan-DPC
Rollup merge of rust-lang#84953 - GuillaumeGomez:remove-unneeded-with…
37ac8c0 
…_default_session_globals, r=jyn514

Remove unneeded call to with_default_session_globals in rustdoc highlight

This was the origin of the `Span` bug in rust-lang#84176.

cc ```@Aaron1011```
r? ```@jyn514```
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request May 6, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 6, 2021
@Dylan-DPC
Rollup merge of rust-lang#84953 - GuillaumeGomez:remove-unneeded-with…
529125e 
…_default_session_globals, r=jyn514

Remove unneeded call to with_default_session_globals in rustdoc highlight

This was the origin of the `Span` bug in rust-lang#84176.

cc ````@Aaron1011````
r? ````@jyn514````
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request May 6, 2021
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request May 6, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 7, 2021
@bors
Auto merge of rust-lang#85014 - Dylan-DPC:rollup-jzpbkdu, r=Dylan-DPC
1773f14 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#84409 (Ensure TLS destructors run before thread joins in SGX)
 - rust-lang#84500 (Add --run flag to compiletest)
 - rust-lang#84728 (Add test for suggestion to borrow unsized function parameters)
 - rust-lang#84734 (Add `needs-unwind` and beginning of support for testing `panic=abort` std to compiletest)
 - rust-lang#84755 (Allow using `core::` in intra-doc links within core itself)
 - rust-lang#84871 (Disallows `#![feature(no_coverage)]` on stable and beta (using standard crate-level gating))
 - rust-lang#84872 (Wire up tidy dependency checks for cg_clif)
 - rust-lang#84896 (Handle incorrect placement of parentheses in trait bounds more gracefully)
 - rust-lang#84905 (CTFE engine: rename copy → copy_intrinsic, move to intrinsics.rs)
 - rust-lang#84953 (Remove unneeded call to with_default_session_globals in rustdoc highlight)
 - rust-lang#84987 (small nits)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3c5da6e into rust-lang:master May 7, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 7, 2021
@GuillaumeGomez GuillaumeGomez deleted the remove-unneeded-with_default_session_globals branch May 7, 2021 08:18
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 7, 2021
Merged
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 8, 2021
@GuillaumeGomez
Rollup merge of rust-lang#84961 - GuillaumeGomez:rework-session-globa…
82e7f7e 
…ls, r=pnkfelix

Rework SESSION_GLOBALS API

Fixes rust-lang#84954.

<s>Needs rust-lang#84953 to be merged first (I cherry-picked its commits to have CI pass).</s> (done)

r? `@Aaron1011`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 8, 2021
@GuillaumeGomez
Rollup merge of rust-lang#84961 - GuillaumeGomez:rework-session-globa…
a20f0d7 
…ls, r=oli-obk

Rework SESSION_GLOBALS API

Fixes rust-lang#84954.

<s>Needs rust-lang#84953 to be merged first (I cherry-picked its commits to have CI pass).</s> (done)

r? `@Aaron1011`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 8, 2021
@GuillaumeGomez
Rollup merge of rust-lang#84961 - GuillaumeGomez:rework-session-globa…
d9297ae 
…ls, r=oli-obk

Rework SESSION_GLOBALS API

Fixes rust-lang#84954.

<s>Needs rust-lang#84953 to be merged first (I cherry-picked its commits to have CI pass).</s> (done)

r? ``@Aaron1011``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jyn514 jyn514

Labels
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.54.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@GuillaumeGomez @jyn514 @matklad @rust-log-analyzer @bors @rust-highfive @rustbot