Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/cgp-core/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ pub use cgp_macro::{
cgp_inherit, cgp_new_provider, cgp_preset, cgp_provider, cgp_type, check_components,
delegate_and_check_components, delegate_components, product, re_export_imports, replace_with,
};
pub use cgp_type::{HasType, ProvideType, UseType};
pub use cgp_type::{HasType, TypeProvider, UseType};
2 changes: 1 addition & 1 deletion crates/cgp-error/src/traits/has_error_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use core::fmt::Debug;

use cgp_component::{DelegateComponent, IsProviderFor, UseContext, WithProvider};
use cgp_macro::cgp_type;
use cgp_type::{ProvideType, UseType};
use cgp_type::{TypeProvider, UseType};

/**
The `HasErrorType` trait provides an abstract error type that can be used by
Expand Down
6 changes: 3 additions & 3 deletions crates/cgp-field/src/impls/use_field.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use core::marker::PhantomData;

use cgp_component::{IsProviderFor, WithProvider};
use cgp_type::{ProvideType, TypeComponent};
use cgp_type::{TypeProvider, TypeProviderComponent};

use crate::traits::{FieldGetter, HasField, HasFieldMut, MutFieldGetter};

Expand Down Expand Up @@ -59,14 +59,14 @@ pub struct UseField<Tag>(pub PhantomData<Tag>);

pub type WithField<Tag> = WithProvider<UseField<Tag>>;

impl<Context, TypeTag, FieldTag, Field> ProvideType<Context, TypeTag> for UseField<FieldTag>
impl<Context, TypeTag, FieldTag, Field> TypeProvider<Context, TypeTag> for UseField<FieldTag>
where
Context: HasField<FieldTag, Value = Field>,
{
type Type = Field;
}

impl<Context, TypeTag, FieldTag, Field> IsProviderFor<TypeComponent, Context, TypeTag>
impl<Context, TypeTag, FieldTag, Field> IsProviderFor<TypeProviderComponent, Context, TypeTag>
for UseField<FieldTag>
where
Context: HasField<FieldTag, Value = Field>,
Expand Down
2 changes: 1 addition & 1 deletion crates/cgp-macro-lib/src/type_component/derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pub fn derive_type_providers(
#provider_trait_name #type_generics
for WithProvider< __Provider__ >
where
__Provider__: ProvideType< #context_name, #component_name, Type = #type_name >,
__Provider__: TypeProvider< #context_name, #component_name, Type = #type_name >,
#type_name: #type_bounds,
#predicates
{
Expand Down
8 changes: 4 additions & 4 deletions crates/cgp-type/src/impls/use_delegated_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ use core::marker::PhantomData;
use cgp_component::{DelegateComponent, IsProviderFor, WithProvider};
use cgp_macro::cgp_provider;

use crate::TypeComponent;
use crate::traits::ProvideType;
use crate::TypeProviderComponent;
use crate::traits::TypeProvider;

pub struct UseDelegatedType<Components>(pub PhantomData<Components>);

pub type WithDelegatedType<Components> = WithProvider<UseDelegatedType<Components>>;

#[cgp_provider(TypeComponent)]
impl<Context, Tag, Components, Type> ProvideType<Context, Tag> for UseDelegatedType<Components>
#[cgp_provider(TypeProviderComponent)]
impl<Context, Tag, Components, Type> TypeProvider<Context, Tag> for UseDelegatedType<Components>
where
Components: DelegateComponent<Tag, Delegate = Type>,
{
Expand Down
8 changes: 4 additions & 4 deletions crates/cgp-type/src/impls/use_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use core::marker::PhantomData;
use cgp_component::{IsProviderFor, WithProvider};
use cgp_macro::cgp_provider;

use crate::TypeComponent;
use crate::traits::ProvideType;
use crate::TypeProviderComponent;
use crate::traits::TypeProvider;

/**
The `UseType` pattern is used to implement a CGP abstract type with the
Expand Down Expand Up @@ -38,7 +38,7 @@ pub struct UseType<Type>(pub PhantomData<Type>);

pub type WithType<Type> = WithProvider<UseType<Type>>;

#[cgp_provider(TypeComponent)]
impl<Context, Tag, Type> ProvideType<Context, Tag> for UseType<Type> {
#[cgp_provider(TypeProviderComponent)]
impl<Context, Tag, Type> TypeProvider<Context, Tag> for UseType<Type> {
type Type = Type;
}
2 changes: 1 addition & 1 deletion crates/cgp-type/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ mod impls;
mod traits;

pub use impls::{UseDelegatedType, UseType, WithDelegatedType, WithType};
pub use traits::{HasType, ProvideType, TypeComponent, TypeOf};
pub use traits::{HasType, TypeOf, TypeProvider, TypeProviderComponent};
3 changes: 1 addition & 2 deletions crates/cgp-type/src/traits/has_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ use cgp_component::{DelegateComponent, IsProviderFor, UseContext, UseDelegate};
use cgp_macro::cgp_component;

#[cgp_component {
name: TypeComponent,
provider: ProvideType,
provider: TypeProvider,
derive_delegate: UseDelegate<Tag>,
}]
pub trait HasType<Tag> {
Expand Down
2 changes: 1 addition & 1 deletion crates/cgp-type/src/traits/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mod has_type;

pub use has_type::{HasType, ProvideType, TypeComponent, TypeOf};
pub use has_type::{HasType, TypeOf, TypeProvider, TypeProviderComponent};
Loading