From 7f9d8480d665b8dcc7b1359372e394d455b6e29a Mon Sep 17 00:00:00 2001
From: David Wood <david.wood@huawei.com>
Date: Wed, 29 Jun 2022 16:22:27 +0100
Subject: [PATCH] macros: move `sess` out of builder

`sess` field of `SessionDiagnosticDeriveBuilder` is never actually used
in the builder's member functions, so it doesn't need to be a field.

Signed-off-by: David Wood <david.wood@huawei.com>
---
 compiler/rustc_macros/src/diagnostics/diagnostic.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/compiler/rustc_macros/src/diagnostics/diagnostic.rs b/compiler/rustc_macros/src/diagnostics/diagnostic.rs
index 00f3951d9a0..27344087fec 100644
--- a/compiler/rustc_macros/src/diagnostics/diagnostic.rs
+++ b/compiler/rustc_macros/src/diagnostics/diagnostic.rs
@@ -20,6 +20,7 @@
 /// The central struct for constructing the `into_diagnostic` method from an annotated struct.
 pub(crate) struct SessionDiagnosticDerive<'a> {
     structure: Structure<'a>,
+    sess: syn::Ident,
     builder: SessionDiagnosticDeriveBuilder,
 }
 
@@ -28,18 +29,18 @@ pub(crate) fn new(diag: syn::Ident, sess: syn::Ident, structure: Structure<'a>)
         Self {
             builder: SessionDiagnosticDeriveBuilder {
                 diag,
-                sess,
                 fields: build_field_mapping(&structure),
                 kind: None,
                 code: None,
                 slug: None,
             },
+            sess,
             structure,
         }
     }
 
     pub(crate) fn into_tokens(self) -> TokenStream {
-        let SessionDiagnosticDerive { mut structure, mut builder } = self;
+        let SessionDiagnosticDerive { mut structure, sess, mut builder } = self;
 
         let ast = structure.ast();
         let attrs = &ast.attrs;
@@ -96,7 +97,7 @@ pub(crate) fn into_tokens(self) -> TokenStream {
                     .each(|field_binding| builder.generate_field_attrs_code(field_binding));
 
                 let span = ast.span().unwrap();
-                let (diag, sess) = (&builder.diag, &builder.sess);
+                let diag = &builder.diag;
                 let init = match (builder.kind, builder.slug) {
                     (None, _) => {
                         span_err(span, "diagnostic kind not specified")
@@ -159,7 +160,6 @@ pub(crate) fn into_tokens(self) -> TokenStream {
             }
         };
 
-        let sess = &builder.sess;
         structure.gen_impl(quote! {
             gen impl<'__session_diagnostic_sess> rustc_session::SessionDiagnostic<'__session_diagnostic_sess, #param_ty>
                     for @Self
@@ -200,8 +200,6 @@ fn descr(&self) -> &'static str {
 /// only to be able to destructure and split `self.builder` and the `self.structure` up to avoid a
 /// double mut borrow later on.
 struct SessionDiagnosticDeriveBuilder {
-    /// Name of the session parameter that's passed in to the `as_error` method.
-    sess: syn::Ident,
     /// The identifier to use for the generated `DiagnosticBuilder` instance.
     diag: syn::Ident,