Cleanup handling of crate_name for doctests
#86501
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @CraftSpider (rust-highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
|
@bors r+ |
|
📌 Commit 615198d97f833ff84065e44d7fc12009700883a4 has been approved by |
jyn514
commented
Jun 21, 2021
src/librustdoc/doctest.rs
Outdated
| let mut global_ctxt = queries.global_ctxt()?.take(); | ||
|
|
||
| let collector = global_ctxt.enter(|tcx| { | ||
| let krate = tcx.hir().krate(); | ||
| let crate_attrs = tcx.hir().attrs(CRATE_HIR_ID); | ||
|
|
||
| let mut opts = scrape_test_config(crate_attrs); | ||
| opts.display_warnings |= options.display_warnings; | ||
| let opts = scrape_test_config(crate_attrs); |
There was a problem hiding this comment.
Err. I accidentally removed this line.
There was a problem hiding this comment.
Whoops, my fault for missing that. Honestly, I thought it was part of your changes to name handling at first.
There was a problem hiding this comment.
No big deal, I missed it too 😆
|
@bors r- until I fix the bug |
It's much more complicated than just going through the TyCtxt.
This makes it consistent with rustc_session::Options.
|
@bors r=CraftSpider Thanks for the review! |
|
📌 Commit ff0e046 has been approved by |
fee1-dead
added a commit
to fee1-dead-contrib/rust
that referenced
this pull request
Jun 22, 2021
Cleanup handling of `crate_name` for doctests - Remove unnecessary reallocation - Remove unnecessary messing around with `queries` for the crate name; it's simpler and faster to go through the TyCtxt instead - Rename `cratename` -> `crate_name` for consistency with the rest of the compiler
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jun 22, 2021
Cleanup handling of `crate_name` for doctests - Remove unnecessary reallocation - Remove unnecessary messing around with `queries` for the crate name; it's simpler and faster to go through the TyCtxt instead - Rename `cratename` -> `crate_name` for consistency with the rest of the compiler
This was referenced Jun 22, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 22, 2021
Rollup of 6 pull requests Successful merges: - rust-lang#86393 (Add regression test for issue rust-lang#52025) - rust-lang#86402 (rustdoc: add optional woff2 versions of Source Serif and Source Code) - rust-lang#86451 (Resolve intra-doc links in summary desc) - rust-lang#86501 (Cleanup handling of `crate_name` for doctests) - rust-lang#86517 (Fix `unused_unsafe` around `await`) - rust-lang#86537 (Mark some edition tests as check-pass) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
queriesfor the crate name; it's simpler and faster to go through the TyCtxt insteadcratename->crate_namefor consistency with the rest of the compiler