Rollup of 7 pull requests #111577
Closed
Rollup of 7 pull requests #111577
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
Change the immediate_dominator return type to Option, and use None to indicate that node has no immediate dominator. Also fix the issue where the start node would be returned as its own immediate dominator.
A warning about an unnecessary drop used to appear when running the linkchecker. Also some clippy warnings
Update doc for `PhantomData` to match code example After rust-lang#106621, there is no longer a `T: 'a` annotation in the doc example, so update the text to match the code.
…henkov fix(resolve): continue when resolved of signle_import is dummy close rust-lang#109343 In rust-lang#109343, `f` in `pub use f as g` points to: |namespace| binding| |-|-| |type| `external crate f`| |value| `None` | |macro| `None` | When resolve `value_ns` during `resolve_doc_links`, the value of the binding of single_import `pub use f as g` goes to `pub use inner::f`, and since it does not satisfy [!self.is_accessible_from(binding.vis, single_import.parent_scope.module)](https://github.com/rust-lang/rust/blob/master/compiler/rustc_resolve/src/ident.rs#L971) and returns `Err(Undetermined)`, which eventually goes to `PathResult::Indeterminate => unreachable!`. This PR adds the `dummy` field to `Import::Single`, which is used to skip import statements that failed resolution. r?`@petrochenkov`
…r=compiler-errors Fix ice caused by shorthand fields in NoFieldsForFnCall Fixes rust-lang#111416
…illot Start node has no immediate dominator Change the immediate_dominator return type to Option, and use None to indicate that node has no immediate dominator. Also fix the issue where the start node would be returned as its own immediate dominator.
… r=compiler-errors add util function to TokenStream to eliminate some clones Another proposed change in the same vein as rust-lang#111492 trying to get rid of some clones. This adds a TokenStream helper function so that rustdoc can directly get a chunks iterator over the underlying token trees so that it no longer needs the clones and vec.
…r=cjgillot Simplify find_width_of_character_at_span. This makes `find_width_of_character_at_span` simpler and more robust against bad spans. Fixes (but does not close, per beta policy) rust-lang#111485
Appease lints Resolved an unnecessary drop warning that appeared when running the linkchecker. Some clippy warnings, too. Edit: Well this fired up all the CI pipeline. I hope that's not a problem.
rustbot
added
S-waiting-on-review
|
@bors r+ rollup=never p=7 |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 7de7fc7 with merge cabd30d323df9dbd7ff073f2fda9daca4070a73e... |
|
@bors r- |
bors
added
S-waiting-on-author
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.
Successful merges:
PhantomDatato match code example #102673 (Update doc forPhantomDatato match code example)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup