fix rebase

Author: estebank

compiler/rustc_resolve/src/diagnostics.rs

@@ -1041,6 +1041,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                                 false,
                                 false,
                                 None,
+                                None,
                             ) else {
                                 continue;
                             };

tests/ui/macros/missing-derive-1.rs

@@ -20,7 +20,7 @@ enum B { //~ HELP `serde` is an attribute that can be used by the derive macros
 enum C {
     A,
     #[sede(untagged)] //~ ERROR cannot find attribute `sede`
-    B, //~^ HELP the derive macros `Serialize` and `Deserialize` accept the similarly named `serde` attribute
+    B, //~^ HELP the derive macros `Deserialize` and `Serialize` accept the similarly named `serde` attribute
 }
 
 #[derive(Serialize, Deserialize)]

tests/ui/macros/missing-derive-1.stderr

@@ -38,10 +38,10 @@ error: cannot find attribute `sede` in this scope
 LL |     #[sede(untagged)]
    |       ^^^^
    |
-help: the derive macros `Serialize` and `Deserialize` accept the similarly named `serde` attribute
+help: the derive macros `Deserialize` and `Serialize` accept the similarly named `serde` attribute
    |
 LL |     #[serde(untagged)]
-   |       ~~~~~
+   |         +
 
 error: aborting due to 3 previous errors
 

tests/ui/macros/missing-derive-2.rs

@@ -20,7 +20,7 @@ enum B { //~ HELP `serde` is an attribute that can be used by the derive macros
 enum C {
     A,
     #[sede(untagged)] //~ ERROR cannot find attribute `sede`
-    B, //~^ HELP the derive macros `Serialize` and `Deserialize` accept the similarly named `serde` attribute
+    B, //~^ HELP the derive macros `Deserialize` and `Serialize` accept the similarly named `serde` attribute
 }
 
 fn main() {}

tests/ui/macros/missing-derive-2.stderr

@@ -4,10 +4,10 @@ error: cannot find attribute `sede` in this scope
 LL |     #[sede(untagged)]
    |       ^^^^
    |
-help: the derive macros `Serialize` and `Deserialize` accept the similarly named `serde` attribute
+help: the derive macros `Deserialize` and `Serialize` accept the similarly named `serde` attribute
    |
 LL |     #[serde(untagged)]
-   |       ~~~~~
+   |         +
 
 error: cannot find attribute `serde` in this scope
   --> $DIR/missing-derive-2.rs:16:7