Remove unnecessary cart bounds

provider/core/src/data_provider.rs

@@ -540,7 +540,7 @@ where
         ) -> <M2::Yokeable as Yokeable<'a>>::Output,
     ) -> DataPayload<'data, M2>
     where
-        M2: DataMarker<'data, Cart = M::Cart>,
+        M2: DataMarker<'data>,
     {
         use DataPayloadInner::*;
         match self.inner {
@@ -598,7 +598,7 @@ where
         ) -> <M2::Yokeable as Yokeable<'a>>::Output,
     ) -> DataPayload<'data, M2>
     where
-        M2: DataMarker<'data, Cart = M::Cart>,
+        M2: DataMarker<'data>,
     {
         use DataPayloadInner::*;
         match &self.inner {
@@ -690,7 +690,7 @@ where
         ) -> <M2::Yokeable as Yokeable<'a>>::Output,
     ) -> DataPayload<'data, M2>
     where
-        M2: DataMarker<'data, Cart = M::Cart>,
+        M2: DataMarker<'data>,
     {
         use DataPayloadInner::*;
         match self.inner {
@@ -756,7 +756,7 @@ where
         ) -> <M2::Yokeable as Yokeable<'a>>::Output,
     ) -> DataPayload<'data, M2>
     where
-        M2: DataMarker<'data, Cart = M::Cart>,
+        M2: DataMarker<'data>,
     {
         use DataPayloadInner::*;
         match &self.inner {
@@ -856,7 +856,7 @@ where
         ) -> Result<<M2::Yokeable as Yokeable<'a>>::Output, E>,
     ) -> Result<DataPayload<'data, M2>, E>
     where
-        M2: DataMarker<'data, Cart = M::Cart>,
+        M2: DataMarker<'data>,
     {
         use DataPayloadInner::*;
         Ok(match self.inner {
@@ -926,7 +926,7 @@ where
         ) -> Result<<M2::Yokeable as Yokeable<'a>>::Output, E>,
     ) -> Result<DataPayload<'data, M2>, E>
     where
-        M2: DataMarker<'data, Cart = M::Cart>,
+        M2: DataMarker<'data>,
     {
         use DataPayloadInner::*;
         Ok(match &self.inner {

provider/core/src/erased.rs

@@ -77,7 +77,6 @@ pub struct ErasedDataYokeable(Rc<dyn ErasedDataStruct>);
 impl<'data, M> crate::dynutil::UpcastDataPayload<'static, M> for ErasedDataStructMarker
 where
     M: DataMarker<'static>,
-    M::Cart: Sized,
 {
     /// Upcast for ErasedDataStruct creates an `Rc<dyn ErasedDataStruct>` from the current inner
     /// `Yoke` (i.e., `Rc::from(yoke)`).
@@ -137,8 +136,6 @@ impl<'data> DataPayload<'static, ErasedDataStructMarker> {
     pub fn downcast<M>(self) -> Result<DataPayload<'static, M>, Error>
     where
         M: DataMarker<'static>,
-        M::Cart: Sized,
-        M::Yokeable: ZeroCopyFrom<M::Cart>,
     {
         use crate::data_provider::DataPayloadInner::*;
         match self.inner {
@@ -183,7 +180,7 @@ impl<'data> DataPayload<'static, ErasedDataStructMarker> {
                 // None of the downcasts succeeded; return an error.
                 Err(Error::MismatchedType {
                     actual: Some(any_rc.type_id()),
-                    generic: Some(TypeId::of::<M::Cart>()),
+                    generic: Some(TypeId::of::<M::Yokeable>()),
                 })
             }
             // This is unreachable because an ErasedDataStruct payload can only be constructed as fully owned
@@ -246,8 +243,6 @@ impl<'data, M> DataProvider<'static, M> for dyn ErasedDataProvider<'data> + 'dat
 where
     M: DataMarker<'static>,
     <M::Yokeable as Yokeable<'static>>::Output: Clone + Any,
-    M::Yokeable: ZeroCopyFrom<M::Cart>,
-    M::Cart: Sized,
 {
     /// Serve [`Sized`] objects from an [`ErasedDataProvider`] via downcasting.
     fn load_payload(&self, req: &DataRequest) -> Result<DataResponse<'static, M>, Error> {

provider/core/src/inv.rs

@@ -8,8 +8,8 @@ use crate::error::Error;
 use crate::iter::IterableDataProviderCore;
 use crate::prelude::*;
 use alloc::boxed::Box;
-use alloc::vec::Vec;
 use alloc::vec;
+use alloc::vec::Vec;
 
 /// A locale-invariant data provider. Sometimes useful for testing. Not intended to be used in
 /// production environments.

provider/core/src/serde.rs

@@ -284,7 +284,6 @@ impl<'data, M> crate::dynutil::UpcastDataPayload<'data, M> for SerdeSeDataStruct
 where
     M: DataMarker<'data>,
     for<'a> &'a <M::Yokeable as Yokeable<'a>>::Output: serde::Serialize,
-    M::Cart: IsCovariant<'data>,
 {
     fn upcast(other: DataPayload<'data, M>) -> DataPayload<'data, SerdeSeDataStructMarker> {
         use crate::data_provider::{DataPayloadInner, ErasedCart};