Don't emit non-asm contents error for naked function composed of errors#95553
Merged
bors merged 2 commits intorust-lang:masterfrom Apr 3, 2022
Merged
Don't emit non-asm contents error for naked function composed of errors#95553bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @cjgillot (rust-highfive has picked a reviewer for you, use r? to override) |
cjgillot
reviewed
Apr 1, 2022
Contributor
cjgillot
left a comment
There was a problem hiding this comment.
Thanks @jam1garner.
This looks good. There is just a stray comment, and it will be good to go.
9563b21 to
0df84cd
Compare
Member
|
This has added/changed tests only to verify behaviour of |
Contributor
Author
Good point, added, thank you ❤️ |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit bf26d87 has been approved by |
Collaborator
|
⌛ Testing commit bf26d87 with merge 92a7455650cc247b4af679fea688bc863205a5ec... |
Collaborator
|
💔 Test failed - checks-actions |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
Author
Contributor
|
@bors retry |
Collaborator
|
⌛ Testing commit bf26d87 with merge 72af5dc9f464de95b6266f831a1bc1f9871ae7f2... |
Collaborator
|
💔 Test failed - checks-actions |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 3, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#95202 (Reduce the cost of loading all built-ins targets) - rust-lang#95553 (Don't emit non-asm contents error for naked function composed of errors) - rust-lang#95613 (Fix rustdoc attribute display) - rust-lang#95617 (Fix &mut invalidation in ptr::swap doctest) - rust-lang#95618 (core: document that the align_of* functions return the alignment in bytes) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
8 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.
Motivation
For naked functions an error is emitted when they are composed of anything other than a single asm!() block. However, this error triggers in a couple situations in which it adds no additional information or is actively misleading.
One example is if you do have an asm!() block but simply one with a syntax error:
This results in two errors, one for the syntax error itself and another telling you that you need an asm block in your function:
This issue also comes up when utilizing
compile_error!()for improving your diagnostics, such as raising a compiler error when compiling for an unsupported target.Implementation
The rules this PR implements are as follows:
The rule of thumb is effectively "if an error is present and its correction could change things, don't raise an error".