Skip to content

Commit d6f513e

Browse files
committed
Auto merge of #60025 - JohnTitor:rename-files, r=petrochenkov
Rename files about error codes fixes #60017 This PR will be failed in tidy. <details> <summary>The log is here:</summary> ``` tidy check tidy error: duplicate error code: 411 tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:83: __diagnostic_used!(E0411); tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:84: err.code(DiagnosticId::Error("E0411".to_owned())); tidy error: duplicate error code: 424 tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:90: debug!("smart_resolve_path_fragment: E0424, source={:?}", source); tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:92: __diagnostic_used!(E0424); tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:93: err.code(DiagnosticId::Error("E0424".to_owned())); some tidy checks failed ``` </details> I'd like to fix this but I don't know what to do. I will work on later. Please let me know if you have any solutions. r? @petrochenkov
2 parents bf843eb + a1d2f72 commit d6f513e

File tree

31 files changed

+2520
-2520
lines changed

31 files changed

+2520
-2520
lines changed

src/doc/rustc-ux-guidelines.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ for details on how to format and write long error codes.
6161

6262
* All of them are accessible [online](http://doc.rust-lang.org/error-index.html),
6363
which are auto-generated from rustc source code in different places:
64-
[librustc](https://github.com/rust-lang/rust/blob/master/src/librustc/diagnostics.rs),
65-
[libsyntax](https://github.com/rust-lang/rust/blob/master/src/libsyntax/diagnostics.rs),
66-
[librustc_borrowck](https://github.com/rust-lang/rust/blob/master/src/librustc_borrowck/diagnostics.rs),
67-
[librustc_metadata](https://github.com/rust-lang/rust/blob/master/src/librustc_metadata/diagnostics.rs),
68-
[librustc_mir](https://github.com/rust-lang/rust/blob/master/src/librustc_mir/diagnostics.rs),
69-
[librustc_passes](https://github.com/rust-lang/rust/blob/master/src/librustc_passes/diagnostics.rs),
70-
[librustc_privacy](https://github.com/rust-lang/rust/blob/master/src/librustc_privacy/diagnostics.rs),
71-
[librustc_resolve](https://github.com/rust-lang/rust/blob/master/src/librustc_resolve/diagnostics.rs),
72-
[librustc_codegen_llvm](https://github.com/rust-lang/rust/blob/master/src/librustc_codegen_llvm/diagnostics.rs),
73-
[librustc_plugin](https://github.com/rust-lang/rust/blob/master/src/librustc_plugin/diagnostics.rs),
74-
[librustc_typeck](https://github.com/rust-lang/rust/blob/master/src/librustc_typeck/diagnostics.rs).
64+
[librustc](https://github.com/rust-lang/rust/blob/master/src/librustc/error_codes.rs),
65+
[libsyntax](https://github.com/rust-lang/rust/blob/master/src/libsyntax/error_codes.rs),
66+
[librustc_borrowck](https://github.com/rust-lang/rust/blob/master/src/librustc_borrowck/error_codes.rs),
67+
[librustc_metadata](https://github.com/rust-lang/rust/blob/master/src/librustc_metadata/error_codes.rs),
68+
[librustc_mir](https://github.com/rust-lang/rust/blob/master/src/librustc_mir/error_codes.rs),
69+
[librustc_passes](https://github.com/rust-lang/rust/blob/master/src/librustc_passes/error_codes.rs),
70+
[librustc_privacy](https://github.com/rust-lang/rust/blob/master/src/librustc_privacy/error_codes.rs),
71+
[librustc_resolve](https://github.com/rust-lang/rust/blob/master/src/librustc_resolve/error_codes.rs),
72+
[librustc_codegen_llvm](https://github.com/rust-lang/rust/blob/master/src/librustc_codegen_llvm/error_codes.rs),
73+
[librustc_plugin](https://github.com/rust-lang/rust/blob/master/src/librustc_plugin/error_codes.rs),
74+
[librustc_typeck](https://github.com/rust-lang/rust/blob/master/src/librustc_typeck/error_codes.rs).
7575
* Explanations have full markdown support. Use it, especially to highlight
7676
code with backticks.
7777
* When talking about the compiler, call it `the compiler`, not `Rust` or
File renamed without changes.

src/librustc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ mod macros;
9999

100100
// N.B., this module needs to be declared first so diagnostics are
101101
// registered before they are used.
102-
pub mod diagnostics;
102+
pub mod error_codes;
103103

104104
#[macro_use]
105105
pub mod query;

src/librustc_codegen_llvm/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ use rustc_mir::monomorphize;
7070
use rustc_codegen_ssa::ModuleCodegen;
7171
use rustc_codegen_utils::codegen_backend::CodegenBackend;
7272

73-
mod diagnostics;
73+
mod error_codes;
7474

7575
mod back {
7676
mod archive;

src/librustc_codegen_ssa/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use syntax_pos::symbol::Symbol;
4141

4242
// N.B., this module needs to be declared first so diagnostics are
4343
// registered before they are used.
44-
mod diagnostics;
44+
mod error_codes;
4545

4646
pub mod common;
4747
pub mod traits;
File renamed without changes.

src/librustc_lint/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#[macro_use]
2626
extern crate rustc;
2727

28-
mod diagnostics;
28+
mod error_codes;
2929
mod nonstandard_style;
3030
pub mod builtin;
3131
mod types;

0 commit comments

Comments
 (0)