about summary refs log tree commit diff
path: root/compiler/rustc_error_codes/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-12-21 01:43:07 +0000
committerbors <bors@rust-lang.org>2023-12-21 01:43:07 +0000
commit3694a6b20af1c4fa228da613e23073c583b9068b (patch)
treebe5732fa0a840e8933e9efa4c44fb77a896a3564 /compiler/rustc_error_codes/src
parent5ac4c8a63ee305742071ac6dd11817f7c24adce2 (diff)
parentc36bb5dbb1f06782491e2d4719f3e757253e4c85 (diff)
downloadrust-3694a6b20af1c4fa228da613e23073c583b9068b.tar.gz
rust-3694a6b20af1c4fa228da613e23073c583b9068b.zip
Auto merge of #119170 - matthiaskrgr:rollup-nllgdf2, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #119135 (Fix crash due to `CrateItem::kind()` not handling constructors)
 - #119141 (Add method to get instance instantiation arguments)
 - #119145 (Give `VariantData::Struct`  named fields, to clairfy `recovered`.)
 - #119167 (E0761: module directory has .rs suffix)
 - #119168 (resolve: Stop feeding visibilities for import list stems)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes/src')
-rw-r--r--compiler/rustc_error_codes/src/error_codes/E0761.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0761.md b/compiler/rustc_error_codes/src/error_codes/E0761.md
index 760c5897698..975f967d0e1 100644
--- a/compiler/rustc_error_codes/src/error_codes/E0761.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0761.md
@@ -15,7 +15,7 @@ fn foo() {}
 
 mod ambiguous_module; // error: file for module `ambiguous_module`
                       // found at both ambiguous_module.rs and
-                      // ambiguous_module.rs/mod.rs
+                      // ambiguous_module/mod.rs
 ```
 
 Please remove this ambiguity by deleting/renaming one of the candidate files.