mirrors/thiserror
1
0
Fork 0
mirror of https://github.com/dtolnay/thiserror.git synced 2025-04-05 13:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Validate transparent attribute

Browse source
This commit is contained in:
David Tolnay 2019-11-30 19:21:50 -08:00
parent e38d6bd1a5
commit 7672b1eccd
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

39
impl/src/valid.rs
View file

@ -18,6 +18,20 @@ impl Input<'_> {
impl Struct<'_> {
fn validate(&self) -> Result<()> {
check_non_field_attrs(&self.attrs)?;
if let Some(transparent) = self.attrs.transparent {
if self.fields.len() != 1 {
return Err(Error::new_spanned(
transparent,
"#[error(transparent)] requires exactly one field",
));
}
if let Some(source) = self.fields.iter().filter_map(|f| f.attrs.source).next() {
return Err(Error::new_spanned(
source,
"transparent error struct can't contain #[source]",
));
}
}
check_field_attrs(&self.fields)?;
for field in &self.fields {
field.validate()?;
@ -32,7 +46,8 @@ impl Enum<'_> {
let has_display = self.has_display();
for variant in &self.variants {
variant.validate()?;
if has_display && variant.attrs.display.is_none() {
if has_display && variant.attrs.display.is_none() && variant.attrs.transparent.is_none()
{
return Err(Error::new_spanned(
variant.original,
"missing #[error(\"...\")] display attribute",
@ -58,6 +73,20 @@ impl Enum<'_> {
impl Variant<'_> {
fn validate(&self) -> Result<()> {
check_non_field_attrs(&self.attrs)?;
if self.attrs.transparent.is_some() {
if self.fields.len() != 1 {
return Err(Error::new_spanned(
self.original,
"#[error(transparent)] requires exactly one field",
));
}
if let Some(source) = self.fields.iter().filter_map(|f| f.attrs.source).next() {
return Err(Error::new_spanned(
source,
"transparent variant can't contain #[source]",
));
}
}
check_field_attrs(&self.fields)?;
for field in &self.fields {
field.validate()?;
@ -97,6 +126,14 @@ fn check_non_field_attrs(attrs: &Attrs) -> Result<()> {
"not expected here; the #[backtrace] attribute belongs on a specific field",
));
}
if let Some(display) = &attrs.display {
if attrs.transparent.is_some() {
return Err(Error::new_spanned(
display.original,
"cannot have both #[error(transparent)] and a display attribute",
));
}
}
Ok(())
}