-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #93441 - notriddle:notriddle/collect-crate-doc-links-…
…very-early, r=petrochenkov rustdoc: load the set of in-scope traits for modules with no docstring Fixes #93428 This fix is a response to a couple of special cases related to the `module_id`, which is eventually used for trait candidates: * The module id is always set to the current crate, when checking `crate::`. Normally, the set of in-scope traits would be set in `load_links_in_attrs`, but if there are no doc comments, then that loop will never run. * the module id is set to the parent module, when resolving a module that is spelled like this: // Notice how we use an outlined doc comment here! // [`Test::my_fn`] mod something { } As with the above problem with `crate::`, we need to make sure the module gets its traits in scope resolved, even if it has no doc comments of its own.
- Loading branch information
Showing
4 changed files
with
41 additions
and
0 deletions.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
pub struct Test<'a> { | ||
data: &'a (), | ||
} | ||
|
||
impl<'a> Test<'a> { | ||
pub fn do_test(&self) {} | ||
} | ||
|
||
// @has crate_relative/demo/index.html | ||
// @has - '//a/@href' '../struct.Test.html#method.do_test' | ||
pub mod demo { | ||
//! [`crate::Test::do_test`] | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
pub mod wrapper { | ||
|
||
pub struct Test<'a> { | ||
data: &'a (), | ||
} | ||
|
||
impl<'a> Test<'a> { | ||
pub fn do_test(&self) {} | ||
} | ||
|
||
// @has mod_relative/wrapper/demo/index.html | ||
// @has - '//a/@href' '../struct.Test.html#method.do_test' | ||
/// [`Test::do_test`] | ||
pub mod demo { | ||
} | ||
|
||
} |