Clean up E0761 explanation #75941
Merged
Clean up E0761 explanation #75941
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
rust-highfive
added
the
S-waiting-on-review
pickfire
reviewed
Aug 26, 2020
| @@ -2,24 +2,20 @@ Multiple candidate files were found for an out-of-line module. | |||
|
|
|||
| Erroneous code example: | |||
|
|
|||
| ```rust | |||
| ```ignore (multiple source files required for compile_fail) | |||
There was a problem hiding this comment.
I never seen this, I thought ignore needs to be at the end?
There was a problem hiding this comment.
It's actually mandatory in error codes explanations. ;)
pickfire
reviewed
Aug 26, 2020
| mod ambiguous_module; // error: file for module `ambiguous_module` | ||
| // found at both ambiguous_module.rs and | ||
| // ambiguous_module.rs/mod.rs | ||
|
|
||
| fn main() {} | ||
| ``` | ||
|
|
||
| Please remove this ambiguity by deleting/renaming one of the candidate files. |
There was a problem hiding this comment.
Suggested change
| Please remove this ambiguity by deleting/renaming one of the candidate files. | |
| Please remove this ambiguity by deleting/renaming one or more of the candidate files. |
|
@bors r+ rollup |
|
📌 Commit c73d4cd has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 28, 2020
…albini Rollup of 12 pull requests Successful merges: - rust-lang#75330 (Improve rendering of crate features via doc(cfg)) - rust-lang#75927 (Use intra-doc links in `core::macros`) - rust-lang#75941 (Clean up E0761 explanation) - rust-lang#75943 (Fix potential UB in align_offset doc examples) - rust-lang#75946 (Error use explicit intra-doc link and fix text) - rust-lang#75955 (Use intra-doc links in `core::future::future` and `core::num::dec2flt`) - rust-lang#75967 (Fix typo in `std::hint::black_box` docs) - rust-lang#75972 (Fix ICE due to carriage return w/ multibyte char) - rust-lang#75989 (Rename rustdoc/test -> rustdoc/doctest) - rust-lang#75996 (fix wording in release notes) - rust-lang#75998 (Add InstrProfilingPlatformFuchsia.c to profiler_builtins) - rust-lang#76000 (Adds --bless support to test/run-make-fulldeps) Failed merges: r? @ghost
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.
r? @Dylan-DPC