From f4daa5d335da8c2843d3e3e12cbe67172ef2d4fa Mon Sep 17 00:00:00 2001 From: Lucas Franceschino Date: Tue, 23 Apr 2024 10:12:29 +0200 Subject: [PATCH] feat(exporter): weaken some useless trait bounds --- frontend/exporter/src/types/copied.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/exporter/src/types/copied.rs b/frontend/exporter/src/types/copied.rs index 3e4060d1a..d9488b389 100644 --- a/frontend/exporter/src/types/copied.rs +++ b/frontend/exporter/src/types/copied.rs @@ -290,7 +290,7 @@ impl<'tcx, S: BaseState<'tcx>> SInto for rustc_hir::hir_id::OwnerId { #[derive( AdtInto, Clone, Debug, Serialize, Deserialize, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord, )] -#[args(<'tcx, S: UnderOwnerState<'tcx> + HasThir<'tcx>>, from: rustc_ast::ast::LitFloatType, state: S as gstate)] +#[args(<'tcx, S: BaseState<'tcx>>, from: rustc_ast::ast::LitFloatType, state: S as gstate)] pub enum LitFloatType { Suffixed(FloatTy), Unsuffixed, @@ -660,7 +660,7 @@ impl<'tcx, S: UnderOwnerState<'tcx>> SInto> /// Reflects both [`rustc_middle::ty::subst::GenericArg`] and [`rustc_middle::ty::subst::GenericArgKind`] #[derive(AdtInto)] -#[args(<'tcx, S: UnderOwnerState<'tcx> + HasThir<'tcx>>, from: rustc_ast::ast::LitIntType, state: S as gstate)] +#[args(<'tcx, S: BaseState<'tcx>>, from: rustc_ast::ast::LitIntType, state: S as gstate)] #[derive( Clone, Debug, Serialize, Deserialize, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord, )] @@ -1948,7 +1948,7 @@ pub enum StrStyle { /// Reflects [`rustc_ast::ast::LitKind`] #[derive(AdtInto)] -#[args(<'tcx, S: UnderOwnerState<'tcx> + HasThir<'tcx>>, from: rustc_ast::ast::LitKind, state: S as gstate)] +#[args(<'tcx, S: BaseState<'tcx>>, from: rustc_ast::ast::LitKind, state: S as gstate)] #[derive( Clone, Debug, Serialize, Deserialize, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord, )] @@ -2000,7 +2000,7 @@ pub enum CommentKind { /// Reflects [`rustc_ast::ast::AttrArgs`] #[derive(AdtInto)] -#[args(, from: rustc_ast::ast::AttrArgs, state: S as tcx)] +#[args(<'tcx, S: BaseState<'tcx>>, from: rustc_ast::ast::AttrArgs, state: S as tcx)] #[derive( Clone, Debug, Serialize, Deserialize, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord, )] @@ -2015,7 +2015,7 @@ pub enum AttrArgs { /// Reflects [`rustc_ast::ast::AttrItem`] #[derive(AdtInto)] -#[args(, from: rustc_ast::ast::AttrItem, state: S as tcx)] +#[args(<'tcx, S: BaseState<'tcx>>, from: rustc_ast::ast::AttrItem, state: S as tcx)] #[derive( Clone, Debug, Serialize, Deserialize, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord, )] @@ -2034,7 +2034,7 @@ impl SInto for rustc_ast::tokenstream::LazyAttrTokenStream { /// Reflects [`rustc_ast::ast::NormalAttr`] #[derive(AdtInto)] -#[args(, from: rustc_ast::ast::NormalAttr, state: S as tcx)] +#[args(<'tcx, S: BaseState<'tcx>>, from: rustc_ast::ast::NormalAttr, state: S as tcx)] #[derive( Clone, Debug, Serialize, Deserialize, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord, )] @@ -2045,7 +2045,7 @@ pub struct NormalAttr { /// Reflects [`rustc_ast::AttrKind`] #[derive(AdtInto)] -#[args(, from: rustc_ast::AttrKind, state: S as tcx)] +#[args(<'tcx, S: BaseState<'tcx>>, from: rustc_ast::AttrKind, state: S as tcx)] #[derive( Clone, Debug, Serialize, Deserialize, JsonSchema, Hash, PartialEq, Eq, PartialOrd, Ord, )]