Skip to content

Commit c570ab5

Browse files
committed
Auto merge of #98037 - compiler-errors:rollup-fbvy456, r=compiler-errors
Rollup of 3 pull requests Successful merges: - #97920 (Fix some test annotations) - #97950 (Clarify `#[derive(PartialEq)]` on enums) - #98011 (Add documentation for error E0208) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1fb9603 + ac73b19 commit c570ab5

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

compiler/rustc_error_codes/src/error_codes.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ E0788: include_str!("./error_codes/E0788.md"),
528528
// E0190, // deprecated: can only cast a &-pointer to an &-object
529529
// E0194, // merged into E0403
530530
// E0196, // cannot determine a type for this closure
531-
E0208,
531+
E0208, // internal error code
532532
// E0209, // builtin traits can only be implemented on structs or enums
533533
// E0213, // associated types are not accepted in this context
534534
// E0215, // angle-bracket notation is not stable with `Fn`
@@ -633,14 +633,14 @@ E0788: include_str!("./error_codes/E0788.md"),
633633
// E0629, // missing 'feature' (rustc_const_unstable)
634634
// E0630, // rustc_const_unstable attribute must be paired with stable/unstable
635635
// attribute
636-
E0640, // infer outlives requirements
636+
E0640, // infer outlives requirements, internal error code
637637
// E0645, // trait aliases not finished
638638
// E0694, // an unknown tool name found in scoped attributes
639639
// E0702, // replaced with a generic attribute input check
640640
// E0707, // multiple elided lifetimes used in arguments of `async fn`
641641
// E0709, // multiple different lifetimes used in arguments of `async fn`
642-
E0711, // a feature has been declared with conflicting stability attributes
643-
E0717, // rustc_promotable without stability attribute
642+
E0711, // a feature has been declared with conflicting stability attributes, internal error code
643+
E0717, // rustc_promotable without stability attribute, internal error code
644644
// E0721, // `await` keyword
645645
// E0723, // unstable feature in `const` context
646646
// E0738, // Removed; errored on `#[track_caller] fn`s in `extern "Rust" { ... }`.

library/core/src/cmp.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ use self::Ordering::*;
6161
///
6262
/// This trait can be used with `#[derive]`. When `derive`d on structs, two
6363
/// instances are equal if all fields are equal, and not equal if any fields
64-
/// are not equal. When `derive`d on enums, each variant is equal to itself
65-
/// and not equal to the other variants.
64+
/// are not equal. When `derive`d on enums, two instances are equal if they
65+
/// are the same variant and all fields are equal.
6666
///
6767
/// ## How can I implement `PartialEq`?
6868
///

src/test/ui/asm/x86_64/issue-82869.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// needs-asm-support
12
// only-x86_64
23
// Make sure rustc doesn't ICE on asm! for a foreign architecture.
34

src/test/ui/asm/x86_64/issue-82869.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
error: invalid register class `vreg`: unknown register class
2-
--> $DIR/issue-82869.rs:10:32
2+
--> $DIR/issue-82869.rs:11:32
33
|
44
LL | asm!("add {:d}, {:d}, d0", out(vreg) c, in(vreg) a, in("d0") {
55
| ^^^^^^^^^^^
66

77
error: invalid register class `vreg`: unknown register class
8-
--> $DIR/issue-82869.rs:10:45
8+
--> $DIR/issue-82869.rs:11:45
99
|
1010
LL | asm!("add {:d}, {:d}, d0", out(vreg) c, in(vreg) a, in("d0") {
1111
| ^^^^^^^^^^
1212

1313
error: invalid register `d0`: unknown register
14-
--> $DIR/issue-82869.rs:10:57
14+
--> $DIR/issue-82869.rs:11:57
1515
|
1616
LL | asm!("add {:d}, {:d}, d0", out(vreg) c, in(vreg) a, in("d0") {
1717
| _________________________________________________________^

src/test/ui/drop/repeat-drop.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// run-pass
2+
// needs-unwind
23
// ignore-wasm32-bare no unwinding panic
34
// ignore-avr no unwinding panic
45
// ignore-nvptx64 no unwinding panic

0 commit comments

Comments
 (0)