rebase fixes

Author: fmease

compiler/rustc_builtin_macros/src/deriving/generic/mod.rs

@@ -320,7 +320,7 @@ impl SkippedDerives {
     }
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug)]
 pub enum IsTuple {
     No,
     Yes,
@@ -1250,7 +1250,7 @@ impl<'a> MethodDef<'a> {
                 .collect();
 
             let self_expr = discr_exprs.remove(0);
-            let other_selflike_exprs = descr_exprs;
+            let other_selflike_exprs = discr_exprs;
             let discr_field = FieldInfo {
                 span,
                 name: None,
@@ -1629,12 +1629,12 @@ impl<'a> TraitDef<'a> {
                                     skipped_derives.add(path.segments[0].ident.name)
                                 } else {
                                     let traits = SUPPORTED_TRAITS.iter().map(|s| format!("`{s}`")).collect::<Vec<_>>().join(", ");
-                                    cx.parse_sess().buffer_lint_with_diagnostic(
+                                    cx.psess().buffer_lint_with_diagnostic(
                                         rustc_session::lint::builtin::UNSUPPORTED_DERIVE_SKIP,
                                         span,
                                         cx.current_expansion.lint_node_id,
                                         crate::fluent_generated::builtin_macros_derive_skip_unsupported,
-                                        rustc_session::lint::BuiltinLintDiagnostics::DeriveSkipUnsupported { traits },
+                                        rustc_session::lint::BuiltinLintDiag::DeriveSkipUnsupported { traits },
                                     )
                                 }
                             }

compiler/rustc_lint/src/context/diagnostics.rs

@@ -347,8 +347,8 @@ pub(super) fn builtin(sess: &Session, diagnostic: BuiltinLintDiag, diag: &mut Di
                 "reduce the glob import's visibility or increase visibility of imported items",
             );
         }
-        BuiltinLintDiagnostics::DeriveSkipUnsupported { traits } => {
-            db.help(format!("the supported traits are {traits}"));
+        BuiltinLintDiag::DeriveSkipUnsupported { traits } => {
+            diag.help(format!("the supported traits are {traits}"));
         }
     }
 }