bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename diagnostic derive things.

Browse source 
For increased consistency.

- session_diagnostic_derive    -> diagnostic_derive
- session_subdiagnostic_derive -> subdiagnostic_derive
- SubdiagnosticDeriveBuilder   -> SubdiagnosticDerive
This commit is contained in:
Nicholas Nethercote 2024-03-08 12:13:39 +11:00
parent e9f0d9be0e
commit 43c06335cf
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_macros/src/diagnostics/mod.rs
View file

@ -6,7 +6,7 @@ mod utils;
use diagnostic::{DiagnosticDerive, LintDiagnosticDerive};
use proc_macro2::TokenStream;
use subdiagnostic::SubdiagnosticDeriveBuilder;
use subdiagnostic::SubdiagnosticDerive;
use synstructure::Structure;
/// Implements `#[derive(Diagnostic)]`, which allows for errors to be specified as a struct,
@ -55,7 +55,7 @@ use synstructure::Structure;
///
/// See rustc dev guide for more examples on using the `#[derive(Diagnostic)]`:
/// <https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-structs.html>
pub fn session_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
pub fn diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
s.underscore_const(true);
DiagnosticDerive::new(s).into_tokens()
}
@ -153,7 +153,7 @@ pub fn lint_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
///
/// diag.subdiagnostic(RawIdentifierSuggestion { span, applicability, ident });
/// ```
pub fn session_subdiagnostic_derive(mut s: Structure<'_>) -> TokenStream {
pub fn subdiagnostic_derive(mut s: Structure<'_>) -> TokenStream {
s.underscore_const(true);
SubdiagnosticDeriveBuilder::new().into_tokens(s)
SubdiagnosticDerive::new().into_tokens(s)
}

6
compiler/rustc_macros/src/diagnostics/subdiagnostic.rs
View file

@ -17,12 +17,12 @@ use synstructure::{BindingInfo, Structure, VariantInfo};
use super::utils::SubdiagnosticVariant;
/// The central struct for constructing the `add_to_diag` method from an annotated struct.
pub(crate) struct SubdiagnosticDeriveBuilder {
pub(crate) struct SubdiagnosticDerive {
diag: syn::Ident,
f: syn::Ident,
}
impl SubdiagnosticDeriveBuilder {
impl SubdiagnosticDerive {
pub(crate) fn new() -> Self {
let diag = format_ident!("diag");
let f = format_ident!("f");
@ -109,7 +109,7 @@ impl SubdiagnosticDeriveBuilder {
/// double mut borrow later on.
struct SubdiagnosticDeriveVariantBuilder<'parent, 'a> {
/// The identifier to use for the generated `Diag` instance.
parent: &'parent SubdiagnosticDeriveBuilder,
parent: &'parent SubdiagnosticDerive,
/// Info for the current variant (or the type if not an enum).
variant: &'a VariantInfo<'a>,