fix: ensure bad #[test] invocs retain correct AST
#110035
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
|
r? @davidtwco (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
davidtwco
reviewed
Apr 10, 2023
| @@ -107,6 +107,36 @@ pub fn expand_test_or_bench( | |||
| return vec![]; | |||
| } | |||
|
|
|||
| let not_testable_error = |item: Option<&ast::Item>| { | |||
| let diag = &cx.sess.parse_sess.span_diagnostic; | |||
| let msg = "the `#[test]` attribute may only be used on a non-associated function"; | |||
There was a problem hiding this comment.
Can you make this translatable? See #100717.
There was a problem hiding this comment.
Sorry, I'd prefer not to do this right now. The whole test.rs file hasn't been converted yet so I feel like that should happen all at once. Also there is some complexity with the error being downgraded to a lint in some cases.
I'm happy to do this if you really want, just not sure it's currently worth the effort.
|
@davidtwco If you are happy with the untranslated diagnostic, can this be merged? |
davidtwco
approved these changes
Apr 12, 2023
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 12, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#109810 (Replace rustdoc-ui/{c,z}-help tests with a stable run-make test ) - rust-lang#110035 (fix: ensure bad `#[test]` invocs retain correct AST) - rust-lang#110089 (sync::mpsc: synchronize receiver disconnect with initialization) - rust-lang#110103 (Report overflows gracefully with new solver) - rust-lang#110122 (Fix x check --stage 1 when download-ci-llvm=false) - rust-lang#110133 (Do not use ImplDerivedObligationCause for inherent impl method error reporting) - rust-lang#110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals") - rust-lang#110235 (Fix `--extend-css` option) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Fixes #109816
Ensures that a
StmtKind::Itemdoesn't get converted into a plainItem(causing the ICE from the linked issue) Also unifies the error path a bit.