diff options
| author | bors <bors@rust-lang.org> | 2020-06-10 00:48:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-10 00:48:35 +0000 |
| commit | bb8674837a9cc5225020e07fc3f164762bb4c11c (patch) | |
| tree | f94c254be282b464db805e6fa9042266d66c47b9 /src/librustc_error_codes/error_codes | |
| parent | 283522400b5c13dfdf2b7e608e63a70ee8e3d7af (diff) | |
| parent | 74380d712d76c8bf48493f751ffda745bf78ecbc (diff) | |
| download | rust-bb8674837a9cc5225020e07fc3f164762bb4c11c.tar.gz rust-bb8674837a9cc5225020e07fc3f164762bb4c11c.zip | |
Auto merge of #73190 - Dylan-DPC:rollup-9wbyh4y, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #72417 (Remove `RawVec::reserve_in_place`.) - #73098 (Add Item::is_fake for rustdoc) - #73122 (Resolve E0584 conflict) - #73123 (Clean up E0647 explanation) - #73133 (Enforce unwind invariants) - #73148 (Fix a typo (size of the size)) - #73149 (typo: awailable -> available) - #73161 (Add mailmap entry) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0583.md | 2 | ||||
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0647.md | 3 | ||||
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0761.md | 25 |
3 files changed, 28 insertions, 2 deletions
diff --git a/src/librustc_error_codes/error_codes/E0583.md b/src/librustc_error_codes/error_codes/E0583.md index 2dcbbf88556..701900bb0cd 100644 --- a/src/librustc_error_codes/error_codes/E0583.md +++ b/src/librustc_error_codes/error_codes/E0583.md @@ -2,7 +2,7 @@ A file wasn't found for an out-of-line module. Erroneous code example: -```ignore (compile_fail not working here; see Issue #43707) +```compile_fail,E0583 mod file_that_doesnt_exist; // error: file not found for module fn main() {} diff --git a/src/librustc_error_codes/error_codes/E0647.md b/src/librustc_error_codes/error_codes/E0647.md index 131db38c00d..8ca6e777f30 100644 --- a/src/librustc_error_codes/error_codes/E0647.md +++ b/src/librustc_error_codes/error_codes/E0647.md @@ -1,4 +1,5 @@ -It is not possible to define `start` with a where clause. +The `start` function was defined with a where clause. + Erroneous code example: ```compile_fail,E0647 diff --git a/src/librustc_error_codes/error_codes/E0761.md b/src/librustc_error_codes/error_codes/E0761.md new file mode 100644 index 00000000000..c01574e413c --- /dev/null +++ b/src/librustc_error_codes/error_codes/E0761.md @@ -0,0 +1,25 @@ +Multiple candidate files were found for an out-of-line module. + +Erroneous code example: + +```rust +// file: ambiguous_module/mod.rs + +fn foo() {} +``` + +```rust +// file: ambiguous_module.rs + +fn foo() {} +``` + +```ignore (multiple source files required for compile_fail) +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. |
