OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unnecessary `forward_inner_docs` hack 

and replace it with `extended_key_value_attributes` feature.
This commit is contained in:
Joshua Nelson 2021-03-17 09:52:45 -04:00
parent 2c7490379d
commit bb7c04ae9c
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/rustc_errors/src/diagnostic_builder.rs
View File

@ -30,15 +30,6 @@ struct DiagnosticBuilderInner<'a> {
allow_suggestions: bool, allow_suggestions: bool,
} }
/// This is a helper macro for [`forward!`] that allows automatically adding documentation
/// that uses tokens from [`forward!`]'s input.
macro_rules! forward_inner_docs {
($e:expr => $i:item) => {
#[doc = $e]
$i
};
}
/// In general, the `DiagnosticBuilder` uses deref to allow access to /// In general, the `DiagnosticBuilder` uses deref to allow access to
/// the fields and methods of the embedded `diagnostic` in a /// the fields and methods of the embedded `diagnostic` in a
/// transparent way. *However,* many of the methods are intended to /// transparent way. *However,* many of the methods are intended to
@ -54,11 +45,11 @@ macro_rules! forward {
pub fn $n:ident(&self, $($name:ident: $ty:ty),* $(,)?) -> &Self pub fn $n:ident(&self, $($name:ident: $ty:ty),* $(,)?) -> &Self
) => { ) => {
$(#[$attrs])* $(#[$attrs])*
forward_inner_docs!(concat!("See [`Diagnostic::", stringify!($n), "()`].") => #[doc = concat!("See [`Diagnostic::", stringify!($n), "()`].")]
pub fn $n(&self, $($name: $ty),*) -> &Self { pub fn $n(&self, $($name: $ty),*) -> &Self {
self.diagnostic.$n($($name),*); self.diagnostic.$n($($name),*);
self self
}); }
}; };
// Forward pattern for &mut self -> &mut Self // Forward pattern for &mut self -> &mut Self
@ -67,11 +58,11 @@ macro_rules! forward {
pub fn $n:ident(&mut self, $($name:ident: $ty:ty),* $(,)?) -> &mut Self pub fn $n:ident(&mut self, $($name:ident: $ty:ty),* $(,)?) -> &mut Self
) => { ) => {
$(#[$attrs])* $(#[$attrs])*
forward_inner_docs!(concat!("See [`Diagnostic::", stringify!($n), "()`].") => #[doc = concat!("See [`Diagnostic::", stringify!($n), "()`].")]
pub fn $n(&mut self, $($name: $ty),*) -> &mut Self { pub fn $n(&mut self, $($name: $ty),*) -> &mut Self {
self.0.diagnostic.$n($($name),*); self.0.diagnostic.$n($($name),*);
self self
}); }
}; };
// Forward pattern for &mut self -> &mut Self, with generic parameters. // Forward pattern for &mut self -> &mut Self, with generic parameters.
@ -84,11 +75,11 @@ macro_rules! forward {
) -> &mut Self ) -> &mut Self
) => { ) => {
$(#[$attrs])* $(#[$attrs])*
forward_inner_docs!(concat!("See [`Diagnostic::", stringify!($n), "()`].") => #[doc = concat!("See [`Diagnostic::", stringify!($n), "()`].")]
pub fn $n<$($generic: $bound),*>(&mut self, $($name: $ty),*) -> &mut Self { pub fn $n<$($generic: $bound),*>(&mut self, $($name: $ty),*) -> &mut Self {
self.0.diagnostic.$n($($name),*); self.0.diagnostic.$n($($name),*);
self self
}); }
}; };
} }

1
compiler/rustc_errors/src/lib.rs
View File

@ -5,6 +5,7 @@
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(crate_visibility_modifier)] #![feature(crate_visibility_modifier)]
#![feature(backtrace)] #![feature(backtrace)]
#![feature(extended_key_value_attributes)]
#![feature(nll)] #![feature(nll)]
#[macro_use] #[macro_use]