diff options
| author | Nixon Enraght-Moony <nixon.emoony@gmail.com> | 2022-11-26 01:40:08 +0000 |
|---|---|---|
| committer | Nixon Enraght-Moony <nixon.emoony@gmail.com> | 2022-11-26 01:41:30 +0000 |
| commit | b1cdb05003c7babbeb2fed779c5ce8619fa91792 (patch) | |
| tree | 6fd237b6250b46df2a91b6d21623eed4566c4219 /src/tools | |
| parent | 8681d4cffcd23bbe619984ab62772a91827a40dc (diff) | |
| download | rust-b1cdb05003c7babbeb2fed779c5ce8619fa91792.tar.gz rust-b1cdb05003c7babbeb2fed779c5ce8619fa91792.zip | |
jsondoclint: Accept trait alias is places where trait expected.
Closes #104923
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/jsondoclint/src/item_kind.rs | 4 | ||||
| -rw-r--r-- | src/tools/jsondoclint/src/validator.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/jsondoclint/src/item_kind.rs b/src/tools/jsondoclint/src/item_kind.rs index a533e367122..546a24a5aed 100644 --- a/src/tools/jsondoclint/src/item_kind.rs +++ b/src/tools/jsondoclint/src/item_kind.rs @@ -111,8 +111,8 @@ impl Kind { pub fn is_variant(self) -> bool { matches!(self, Kind::Variant) } - pub fn is_trait(self) -> bool { - matches!(self, Kind::Trait) + pub fn is_trait_or_alias(self) -> bool { + matches!(self, Kind::Trait | Kind::TraitAlias) } pub fn is_type(self) -> bool { matches!(self, Kind::Struct | Kind::Enum | Kind::Union | Kind::Typedef) diff --git a/src/tools/jsondoclint/src/validator.rs b/src/tools/jsondoclint/src/validator.rs index 9548276d826..f8a497b1295 100644 --- a/src/tools/jsondoclint/src/validator.rs +++ b/src/tools/jsondoclint/src/validator.rs @@ -266,7 +266,7 @@ impl<'a> Validator<'a> { fn check_path(&mut self, x: &'a Path, kind: PathKind) { match kind { - PathKind::Trait => self.add_trait_id(&x.id), + PathKind::Trait => self.add_trait_or_alias_id(&x.id), PathKind::Type => self.add_type_id(&x.id), } if let Some(args) = &x.args { @@ -391,8 +391,8 @@ impl<'a> Validator<'a> { self.add_id_checked(id, Kind::is_variant, "Variant"); } - fn add_trait_id(&mut self, id: &'a Id) { - self.add_id_checked(id, Kind::is_trait, "Trait"); + fn add_trait_or_alias_id(&mut self, id: &'a Id) { + self.add_id_checked(id, Kind::is_trait_or_alias, "Trait (or TraitAlias)"); } fn add_type_id(&mut self, id: &'a Id) { |
