Improve code for FileName retrieval in rustdoc #133804
Merged
Conversation
This file contains 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
rustbot
added
S-waiting-on-review
notriddle
requested changes
Dec 3, 2024
src/librustdoc/html/sources.rs
Outdated
| @@ -50,8 +50,14 @@ struct LocalSourcesCollector<'a, 'tcx> { | |||
| src_root: &'a Path, | |||
| } | |||
|
|
|||
| fn is_real_and_local(span: clean::Span, sess: &Session) -> bool { | |||
| span.cnum(sess) == LOCAL_CRATE && span.filename(sess).is_real() | |||
| fn is_real_and_local(span: clean::Span, sess: &Session) -> Option<RealFileName> { | |||
There was a problem hiding this comment.
If it's not a bool function, why would it have an is_ name?
Perhaps it should be called filename_real_and_local instead?
There was a problem hiding this comment.
Agreed. Updated to the suggested name.
rustbot
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
improve-code
branch
from
b885c29 to
2997ec5
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 4, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#133651 (Update `NonZero` and `NonNull` to not field-project (per MCP#807)) - rust-lang#133764 (rustdoc: Rename `set_back_info` to `restore_module_data`.) - rust-lang#133784 (Fix MutVisitor's default implementations to visit Stmt's and BinOp's spans) - rust-lang#133798 (stop replacing bivariant args with `'static` when computing closure requirements) - rust-lang#133804 (Improve code for FileName retrieval in rustdoc) - rust-lang#133817 (Use `eprintln` instead of `println` in bootstrap/compiletest/tidy) Failed merges: - rust-lang#133810 (remove unnecessary `eval_verify_bound`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 4, 2024
Rollup merge of rust-lang#133804 - GuillaumeGomez:improve-code, r=notriddle Improve code for FileName retrieval in rustdoc Some calls were performed twice (first in `is_real_and_local` and then in the function calling it). Also the `FileName` was matched on a few times too. r? `@notriddle`
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.
Some calls were performed twice (first in
is_real_and_localand then in the function calling it). Also theFileNamewas matched on a few times too.r? @notriddle