expand: fix minor diagnostics bug#123694
Merged
bors merged 3 commits intorust-lang:masterfrom May 17, 2024
Merged
Conversation
Collaborator
rustbot
added
S-waiting-on-review
compiler-errors
approved these changes
Apr 10, 2024
estebank
approved these changes
Apr 10, 2024
Contributor
estebank
left a comment
estebank
left a comment
There was a problem hiding this comment.
Could you add a test triggering these two cases?
compiler/rustc_expand/messages.ftl
Outdated
Comment on lines
15
to
16
| .help_outer_doc = `///` is for documentation comments. For a plain comment, use `//`. | ||
| .help_inner_doc = `//!` is for documentation comments. For a plain comment, insert a space: `// !` |
Contributor
There was a problem hiding this comment.
Suggested change
| .help_outer_doc = `///` is for documentation comments. For a plain comment, use `//`. | |
| .help_inner_doc = `//!` is for documentation comments. For a plain comment, insert a space: `// !` | |
| .help_outer_doc = `///` is used for outer documentation comments; for a plain comment, use `//`. | |
| .help_inner_doc = `//!` is used for inner documentation comments; for a plain comment, `//` by removing the `!` or inserting a space in between them `// !` |
Contributor
Author
There was a problem hiding this comment.
I think there's a missing "use" after the comma in the inner doc help string? Please check if the current version matches what you had in mind.
Xiretza
force-pushed
the
expand-diagnostics
branch
from
b3ee37d to
b493127
Compare
This comment has been minimized.
This comment has been minimized.
Xiretza
force-pushed
the
expand-diagnostics
branch
2 times, most recently
from
2d2062a to
8e978cb
Compare
The error mentions `///`, when it's actually `//!`: error[E0658]: attributes on expressions are experimental --> test.rs:4:9 | 4 | //! wah | ^^^^^^^ | = note: see issue rust-lang#15701 <rust-lang#15701> for more information = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable = help: `///` is for documentation comments. For a plain comment, use `//`.
Xiretza
force-pushed
the
expand-diagnostics
branch
from
8e978cb to
3289a9a
Compare
Contributor
Author
|
ping |
Contributor
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 15, 2024
…er-errors expand: fix minor diagnostics bug The error mentions `///`, when it's actually `//!`: ``` error[E0658]: attributes on expressions are experimental --> test.rs:4:9 | 4 | //! wah | ^^^^^^^ | = note: see issue rust-lang#15701 <rust-lang#15701> for more information = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable = help: `///` is for documentation comments. For a plain comment, use `//`. ```
Collaborator
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Collaborator
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Contributor
Author
|
I don't think that was my fault? Not entirely sure though, maybe the relevant logs are just somewhere else. |
Contributor
|
@bors retry |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2024
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#123694 (expand: fix minor diagnostics bug) - rust-lang#125171 (Rename `flatten(_mut)` → `as_flattened(_mut)`) - rust-lang#125181 (set `rust.channel` properly in source tarballs) - rust-lang#125186 (Remove duplicate word from addr docs) - rust-lang#125191 (Report better WF obligation leaf obligations in new solver) r? `@ghost` `@rustbot` modify labels: rollup
Collaborator
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2024
Rollup merge of rust-lang#123694 - Xiretza:expand-diagnostics, r=compiler-errors expand: fix minor diagnostics bug The error mentions `///`, when it's actually `//!`: ``` error[E0658]: attributes on expressions are experimental --> test.rs:4:9 | 4 | //! wah | ^^^^^^^ | = note: see issue rust-lang#15701 <rust-lang#15701> for more information = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable = help: `///` is for documentation comments. For a plain comment, use `//`. ```
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
The error mentions
///, when it's actually//!: