Skip to content

Commit 045612b

Browse files
committed
Auto merge of #90616 - mathstuf:error_codes-comment-uniformity, r=GuillaumeGomez
error_codes: uniformly comment error codes
2 parents d22dd65 + 863e522 commit 045612b

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

compiler/rustc_error_codes/src/error_codes.rs

+19-20
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,9 @@ E0785: include_str!("./error_codes/E0785.md"),
487487
;
488488
// E0006, // merged with E0005
489489
// E0008, // cannot bind by-move into a pattern guard
490-
// E0019, merged into E0015
491-
// E0035, merged into E0087/E0089
492-
// E0036, merged into E0087/E0089
490+
// E0019, // merged into E0015
491+
// E0035, // merged into E0087/E0089
492+
// E0036, // merged into E0087/E0089
493493
// E0068,
494494
// E0085,
495495
// E0086,
@@ -504,8 +504,8 @@ E0785: include_str!("./error_codes/E0785.md"),
504504
// E0134,
505505
// E0135,
506506
// E0141,
507-
// E0153, unused error code
508-
// E0157, unused error code
507+
// E0153, // unused error code
508+
// E0157, // unused error code
509509
// E0159, // use of trait `{}` as struct constructor
510510
// E0163, // merged into E0071
511511
// E0167,
@@ -573,24 +573,24 @@ E0785: include_str!("./error_codes/E0785.md"),
573573
// between structures with the same definition
574574
// E0385, // {} in an aliasable location
575575
// E0402, // cannot use an outer type parameter in this context
576-
// E0406, merged into 420
577-
// E0410, merged into 408
578-
// E0413, merged into 530
579-
// E0414, merged into 530
580-
// E0417, merged into 532
581-
// E0418, merged into 532
582-
// E0419, merged into 531
583-
// E0420, merged into 532
584-
// E0421, merged into 531
585-
// E0427, merged into 530
576+
// E0406, // merged into 420
577+
// E0410, // merged into 408
578+
// E0413, // merged into 530
579+
// E0414, // merged into 530
580+
// E0417, // merged into 532
581+
// E0418, // merged into 532
582+
// E0419, // merged into 531
583+
// E0420, // merged into 532
584+
// E0421, // merged into 531
585+
// E0427, // merged into 530
586586
// E0456, // plugin `..` is not available for triple `..`
587587
E0457, // plugin `..` only found in rlib format, but must be available...
588588
E0460, // found possibly newer version of crate `..`
589589
E0461, // couldn't find crate `..` with expected target triple ..
590590
E0462, // found staticlib `..` instead of rlib or dylib
591591
E0465, // multiple .. candidates for `..` found
592-
// E0467, removed
593-
// E0470, removed
592+
// E0467, // removed
593+
// E0470, // removed
594594
// E0471, // constant evaluation error (in pattern)
595595
E0472, // llvm_asm! is unsupported on this target
596596
// E0473, // dereference of reference outside its lifetime
@@ -610,8 +610,7 @@ E0785: include_str!("./error_codes/E0785.md"),
610610
E0490, // a value of type `..` is borrowed for too long
611611
E0514, // metadata version mismatch
612612
E0519, // local crate and dependency have same (crate-name, disambiguator)
613-
// two dependencies have same (crate-name, disambiguator) but different SVH
614-
E0523,
613+
E0523, // two dependencies have same (crate-name, disambiguator) but different SVH
615614
// E0526, // shuffle indices are not constant
616615
// E0540, // multiple rustc_deprecated attributes
617616
// E0548, // replaced with a generic attribute input check
@@ -638,7 +637,7 @@ E0785: include_str!("./error_codes/E0785.md"),
638637
E0711, // a feature has been declared with conflicting stability attributes
639638
E0717, // rustc_promotable without stability attribute
640639
// E0721, // `await` keyword
641-
// E0723, unstable feature in `const` context
640+
// E0723, // unstable feature in `const` context
642641
E0726, // non-explicit (not `'_`) elided lifetime in unsupported position
643642
// E0738, // Removed; errored on `#[track_caller] fn`s in `extern "Rust" { ... }`.
644643
E0772, // `'static' obligation coming from `impl dyn Trait {}` or `impl Foo for dyn Bar {}`.

0 commit comments

Comments
 (0)