diff options
| author | bors <bors@rust-lang.org> | 2021-06-24 04:48:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-24 04:48:46 +0000 |
| commit | 964a81eb37db6ee33b8fc107582618bf2befe02d (patch) | |
| tree | 476a676f704c5b73f01ada725e776074d78265ec /compiler/rustc_error_codes/src | |
| parent | f1e691da2e640bb45fe18f8a5bd8f7afa65ce21d (diff) | |
| parent | 64c9712cf3f49644158f759d10783b31aa176042 (diff) | |
| download | rust-964a81eb37db6ee33b8fc107582618bf2befe02d.tar.gz rust-964a81eb37db6ee33b8fc107582618bf2befe02d.zip | |
Auto merge of #86588 - JohnTitor:rollup-ibgjbkf, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #86137 (Error code cleanup and enforce checks) - #86296 (Add documentation for various THIR structs) - #86415 (Document associativity of iterator folds.) - #86533 (Support lowercase error codes in `--explain`) - #86536 (Edition 2021 enables disjoint capture) - #86560 (Update cargo) - #86561 (chore(rustdoc): Remove unused impl block) - #86566 (Use `use_verbose` for `mir::Constant`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes/src')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes.rs b/compiler/rustc_error_codes/src/error_codes.rs index f10efd83236..ff7a2344e69 100644 --- a/compiler/rustc_error_codes/src/error_codes.rs +++ b/compiler/rustc_error_codes/src/error_codes.rs @@ -609,7 +609,7 @@ E0783: include_str!("./error_codes/E0783.md"), // E0540, // multiple rustc_deprecated attributes E0544, // multiple stability levels // E0548, // replaced with a generic attribute input check - E0553, // multiple rustc_const_unstable attributes +// E0553, // multiple rustc_const_unstable attributes // E0555, // replaced with a generic attribute input check // E0558, // replaced with a generic attribute input check // E0563, // cannot determine a type for this `impl Trait` removed in 6383de15 @@ -620,10 +620,9 @@ E0783: include_str!("./error_codes/E0783.md"), // E0612, // merged into E0609 // E0613, // Removed (merged with E0609) E0625, // thread-local statics cannot be accessed at compile-time - E0629, // missing 'feature' (rustc_const_unstable) - // rustc_const_unstable attribute must be paired with stable/unstable - // attribute - E0630, +// E0629, // missing 'feature' (rustc_const_unstable) +// E0630, // rustc_const_unstable attribute must be paired with stable/unstable + // attribute E0632, // cannot provide explicit generic arguments when `impl Trait` is // used in argument position E0640, // infer outlives requirements |