No source fixes #144864
Merged
No source fixes #144864
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? @SparrowLii rustbot has assigned @SparrowLii. Use |
|
This PR modifies |
This comment has been minimized.
This comment has been minimized.
0349864 to
e29c33f
Compare
jieyouxu
reviewed
Aug 4, 2025
e29c33f to
c855af5
Compare
c855af5 to
5f97bad
Compare
This comment has been minimized.
This comment has been minimized.
5f97bad to
618a8fd
Compare
This comment has been minimized.
This comment has been minimized.
618a8fd to
c417e22
Compare
This comment has been minimized.
This comment has been minimized.
c417e22 to
2bd47d2
Compare
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
jieyouxu
approved these changes
Aug 28, 2025
| @@ -6,7 +6,6 @@ LL | fn new() -> NoResult<MyEnum, String> { | |||
| --> $SRC_DIR/core/src/result.rs:LL:COL | |||
| | | |||
| = note: similarly named enum `Result` defined here | |||
| | | |||
There was a problem hiding this comment.
Remark: hm, I wonder if the spacing originally was intended to help make the separation between the note vs the subsequent help clearer, but IMO this is not very different, so it's fine.
|
@bors r+ rollup |
bors
added a commit
that referenced
this pull request
Aug 28, 2025
Rollup of 9 pull requests Successful merges: - #142727 (wasm: rm static mut) - #143193 (Port `#[link]` to the new attribute parsing infrastructure ) - #144864 (No source fixes) - #145913 (Add spin_loop hint for LoongArch) - #145926 (compiletest: Remove several remnants of the old libtest-based executor) - #145928 (Rename `Location::file_with_nul` to `file_as_c_str`) - #145930 (`const`ify (the unstable) `str::as_str`) - #145941 (Disable `integer_to_ptr_transmutes` suggestion for unsized types) - #145953 (Update `icu_list` to 2.0) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Aug 28, 2025
Rollup merge of #144864 - Muscraft:no-source-fixes, r=jieyouxu No source fixes This PR started as a fix for a rendering bug that [got noticed in #143661](#143661 (comment)), but turned into a fix for any rendering bugs related to files with no source. - Don't add an end column separator after a file with no source - Add column separator before secondary messages with no source - Render continuation between no source labels Before ``` error[E0423]: expected function, tuple struct or tuple variant, found struct `std::collections::HashMap` ╭▸ $DIR/multi-suggestion.rs:17:13 │ LL │ let _ = std::collections::HashMap(); │ ━━━━━━━━━━━━━━━━━━━━━━━━━━━ ╭▸ $SRC_DIR/std/src/collections/hash/map.rs:LL:COL │ ╰ note: `std::collections::HashMap` defined here ╰╴ note: constructor is not visible here due to private fields ╭▸ $SRC_DIR/alloc/src/boxed.rs:LL:COL │ ╰ note: private field │ ╰ note: private field ``` After ``` error[E0423]: expected function, tuple struct or tuple variant, found struct `std::collections::HashMap` ╭▸ $DIR/multi-suggestion.rs:17:13 │ LL │ let _ = std::collections::HashMap(); │ ━━━━━━━━━━━━━━━━━━━━━━━━━━━ ╰╴ ╭▸ $SRC_DIR/std/src/collections/hash/map.rs:LL:COL │ ╰ note: `std::collections::HashMap` defined here note: constructor is not visible here due to private fields ╭▸ $SRC_DIR/alloc/src/boxed.rs:LL:COL │ ├ note: private field │ ╰ note: private field ``` Note: This PR also makes it so `rustc` and `annotate-snippets` match in these cases
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.
This PR started as a fix for a rendering bug that got noticed in #143661, but turned into a fix for any rendering bugs related to files with no source.
Before
After
Note: This PR also makes it so
rustcandannotate-snippetsmatch in these cases