Move diagnostic.rs to rustc_ast, part 2

Author: mejrs

compiler/rustc_ast/src/attr/diagnostic.rs

@@ -2,15 +2,12 @@
 use std::fmt;
 use std::fmt::Debug;
 
-pub use rustc_ast::attr::data_structures::*;
-use rustc_macros::{Decodable, Encodable, PrintAttribute, StableHash};
+use rustc_macros::{Decodable, Encodable, StableHash};
 use rustc_span::{DesugaringKind, Span, Symbol, kw};
 use thin_vec::ThinVec;
 use tracing::debug;
 
-use crate::attrs::PrintAttribute;
-
-#[derive(Clone, Default, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Default, Debug, StableHash, Encodable, Decodable)]
 pub struct Directive {
     pub is_rustc_attr: bool,
     /// This is never nested more than once, i.e. the directives in this
@@ -109,7 +106,7 @@ impl CustomDiagnostic {
 
 /// Like [std::fmt::Arguments] this is a string that has been parsed into "pieces",
 /// either as string pieces or dynamic arguments.
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub struct FormatString {
     pub input: Symbol,
     pub span: Span,
@@ -211,13 +208,13 @@ pub struct FormatArgs {
     pub generic_args: Vec<(Symbol, String)> = Vec::new(),
 }
 
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub enum Piece {
     Lit(Symbol),
     Arg(FormatArg),
 }
 
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub enum FormatArg {
     // A generic parameter, like `{T}` if we're on the `From<T>` trait.
     GenericParam {
@@ -237,7 +234,7 @@ pub enum FormatArg {
 }
 
 /// Represents the `on` filter in `#[rustc_on_unimplemented]`.
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub struct Filter {
     pub span: Span,
     pub pred: Predicate,
@@ -262,7 +259,7 @@ impl Filter {
 ///
 /// It is similar to the predicate in the `cfg` attribute,
 /// and may contain nested predicates.
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub enum Predicate {
     /// A condition like `on(crate_local)`.
     Flag(Flag),
@@ -300,7 +297,7 @@ impl Predicate {
 }
 
 /// Represents a `MetaWord` in an `on`-filter.
-#[derive(Clone, Copy, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Copy, Debug, StableHash, Encodable, Decodable)]
 pub enum Flag {
     /// Whether the code causing the trait bound to not be fulfilled
     /// is part of the user's crate.
@@ -315,7 +312,7 @@ pub enum Flag {
 /// A `MetaNameValueStr` in an `on`-filter.
 ///
 /// For example, `#[rustc_on_unimplemented(on(name = "value", message = "hello"))]`.
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub struct NameValue {
     pub name: Name,
     /// Something like `"&str"` or `"alloc::string::String"`,
@@ -334,7 +331,7 @@ impl NameValue {
 }
 
 /// The valid names of the `on` filter.
-#[derive(Clone, Copy, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Copy, Debug, StableHash, Encodable, Decodable)]
 pub enum Name {
     Cause,
     FromDesugaring,
@@ -354,7 +351,7 @@ pub enum FlagOrNv<'p> {
 /// If it is a simple literal like this then `pieces` will be `[LitOrArg::Lit("value")]`.
 /// The `Arg` variant is used when it contains formatting like
 /// `#[rustc_on_unimplemented(on(Self = "&[{A}]", message = "hello"))]`.
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub struct FilterFormatString {
     pub pieces: ThinVec<LitOrArg>,
 }
@@ -386,7 +383,7 @@ impl FilterFormatString {
     }
 }
 
-#[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
+#[derive(Clone, Debug, StableHash, Encodable, Decodable)]
 pub enum LitOrArg {
     Lit(Symbol),
     Arg(Symbol),

compiler/rustc_ast/src/attr/mod.rs

@@ -1,6 +1,7 @@
 //! Functions dealing with attributes and meta items.
 
 pub mod data_structures;
+pub mod diagnostic;
 pub mod version;
 
 use std::fmt::Debug;

compiler/rustc_ast/src/lib.rs

@@ -7,6 +7,7 @@
 // tidy-alphabetical-start
 #![doc(test(attr(deny(warnings), allow(internal_features))))]
 #![feature(associated_type_defaults)]
+#![feature(default_field_values)]
 #![feature(deref_patterns)]
 #![feature(iter_order_by)]
 #![feature(macro_metavar_expr)]

compiler/rustc_hir/src/attrs/mod.rs

@@ -7,9 +7,9 @@
 pub use data_structures::*;
 pub use encode_cross_crate::EncodeCrossCrate;
 pub use pretty_printing::PrintAttribute;
+pub use rustc_ast::attr::diagnostic;
 
 mod data_structures;
-pub mod diagnostic;
 mod encode_cross_crate;
 mod pretty_printing;
 

compiler/rustc_hir/src/attrs/pretty_printing.rs

@@ -17,6 +17,7 @@ use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol};
 use rustc_target::spec::SanitizerSet;
 use thin_vec::ThinVec;
 
+use crate::attrs::diagnostic::Directive;
 use crate::limit::Limit;
 
 /// This trait is used to print attributes in `rustc_hir_pretty`.
@@ -209,4 +210,5 @@ print_debug!(
     CfgEntry,
     DiffActivity,
     DiffMode,
+    Directive,
 );

tests/ui/unpretty/diagnostic-attr.stdout

@@ -6,27 +6,13 @@ use ::std::prelude::rust_2015::*;
 //@ check-pass
 //@ edition: 2015
 
-#[attr = OnUnimplemented {directive: Directive {is_rustc_attr: false,
-filters: [],
-message: FormatString {input: "My Message for `ImportantTrait<{A}>` implemented for `{Self}`",
-pieces: [Lit("My Message for `ImportantTrait<"),
-Arg(GenericParam {generic_param: "A"}), Lit(">` implemented for `"),
-Arg(SelfUpper), Lit("`")]}, label: FormatString {input: "My Label",
-pieces: [Lit("My Label")]}, notes: [FormatString {input: "Note 1",
-pieces: [Lit("Note 1")]}, FormatString {input: "Note 2",
-pieces: [Lit("Note 2")]}]}}]
+#[attr = OnUnimplemented {directive: Directive { is_rustc_attr: false, filters: [], message: Some(($DIR/diagnostic-attr.rs:7:5: 7:78 (#0), FormatString { input: "My Message for `ImportantTrait<{A}>` implemented for `{Self}`", span: $DIR/diagnostic-attr.rs:7:15: 7:78 (#0), pieces: [Lit("My Message for `ImportantTrait<"), Arg(GenericParam { generic_param: "A", span: $DIR/diagnostic-attr.rs:7:48: 7:49 (#0) }), Lit(">` implemented for `"), Arg(SelfUpper), Lit("`")] })), label: Some(($DIR/diagnostic-attr.rs:8:5: 8:23 (#0), FormatString { input: "My Label", span: $DIR/diagnostic-attr.rs:8:13: 8:23 (#0), pieces: [Lit("My Label")] })), notes: [FormatString { input: "Note 1", span: $DIR/diagnostic-attr.rs:9:12: 9:20 (#0), pieces: [Lit("Note 1")] }, FormatString { input: "Note 2", span: $DIR/diagnostic-attr.rs:10:12: 10:20 (#0), pieces: [Lit("Note 2")] }], parent_label: None }}]
 trait ImportantTrait<A> { }
 
 #[attr = DoNotRecommend]
 impl <T> ImportantTrait<T> for T where T: Clone { }
 
 struct X;
 
-#[attr = OnConst {directive: Directive {is_rustc_attr: false, filters: [],
-message: FormatString {input: "My Message for `ImportantTrait<u8>` implemented for `{Self}`",
-pieces: [Lit("My Message for `ImportantTrait<u8>` implemented for `"),
-Arg(SelfUpper), Lit("`")]}, label: FormatString {input: "My Label",
-pieces: [Lit("My Label")]}, notes: [FormatString {input: "Note 1",
-pieces: [Lit("Note 1")]}, FormatString {input: "Note 2",
-pieces: [Lit("Note 2")]}]}}]
+#[attr = OnConst {directive: Directive { is_rustc_attr: false, filters: [], message: Some(($DIR/diagnostic-attr.rs:20:5: 20:77 (#0), FormatString { input: "My Message for `ImportantTrait<u8>` implemented for `{Self}`", span: $DIR/diagnostic-attr.rs:20:15: 20:77 (#0), pieces: [Lit("My Message for `ImportantTrait<u8>` implemented for `"), Arg(SelfUpper), Lit("`")] })), label: Some(($DIR/diagnostic-attr.rs:21:5: 21:23 (#0), FormatString { input: "My Label", span: $DIR/diagnostic-attr.rs:21:13: 21:23 (#0), pieces: [Lit("My Label")] })), notes: [FormatString { input: "Note 1", span: $DIR/diagnostic-attr.rs:22:12: 22:20 (#0), pieces: [Lit("Note 1")] }, FormatString { input: "Note 2", span: $DIR/diagnostic-attr.rs:23:12: 23:20 (#0), pieces: [Lit("Note 2")] }], parent_label: None }}]
 impl ImportantTrait<u8> for X { }

triagebot.toml

@@ -1457,7 +1457,7 @@ cc = ["@rust-lang/wg-const-eval"]
 [mentions."compiler/rustc_attr_parsing/src/attributes/diagnostic"]
 message = "Some changes occurred to diagnostic attributes."
 cc = ["@mejrs"]
-[mentions."compiler/rustc_hir/src/attrs/diagnostic.rs"]
+[mentions."compiler/rustc_ast/src/attr/diagnostic.rs"]
 message = "Some changes occurred to diagnostic attributes."
 cc = ["@mejrs"]