Remove extension traits

activitystreams-derive/src/lib.rs

@@ -110,8 +110,7 @@ use syn::{
 ///     #[activitystreams(None)]
 ///     my_field: MyProperties,
 ///
-///     /// Derive the above, plus Object (activitystreams-traits) and ObjectExt
+///     /// Derive the above, plus Object (activitystreams-traits)
-///     /// (activitystreams-types)
 ///     #[activitystreams(Object)]
 ///     obj_field: ObjectProperties,
 /// }
@@ -158,7 +157,6 @@ pub fn ref_derive(input: TokenStream) -> TokenStream {
         .flat_map(move |(ident, ty, attr)| {
             let object = from_value(attr);
             let name = name.clone();
-            let ext_trait = Ident::new(&format!("{}Ext", object), name.span());
 
             let base_impl = if object.to_string() == "Object" || object.to_string() == "Link" {
                 quote! {
@@ -183,20 +181,6 @@ pub fn ref_derive(input: TokenStream) -> TokenStream {
                 }
             };
 
-            let activity_impls = quote! {
-                #base_impl
-
-                impl #ext_trait for #name {
-                    fn props(&self) -> &#ty {
-                        self.as_ref()
-                    }
-
-                    fn props_mut(&mut self) -> &mut #ty {
-                        self.as_mut()
-                    }
-                }
-            };
-
             let ref_impls = quote! {
                 impl AsRef<#ty> for #name {
                     fn as_ref(&self) -> &#ty {
@@ -216,7 +200,7 @@ pub fn ref_derive(input: TokenStream) -> TokenStream {
             } else {
                 quote! {
                     #ref_impls
-                    #activity_impls
+                    #base_impl
                 }
             }
         })

activitystreams-types/src/activity/accept.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::AcceptType,
     properties::{AcceptProperties, ActivityProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor accepts the object.
 ///

activitystreams-types/src/activity/add.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::AddType,
     properties::{ActivityProperties, AddProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has added the object to the target.
 ///

activitystreams-types/src/activity/amove.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::MoveType,
     properties::{ActivityProperties, MoveProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has moved object from origin to target.
 ///

activitystreams-types/src/activity/announce.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::AnnounceType,
     properties::{ActivityProperties, AnnounceProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is calling the target's attention the object.
 ///

activitystreams-types/src/activity/arrive.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::ArriveType,
     properties::{ActivityProperties, ArriveProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// An IntransitiveActivity that indicates that the actor has arrived at the location.
 ///

activitystreams-types/src/activity/block.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::BlockType,
     properties::{ActivityProperties, BlockProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is blocking the object.
 ///

activitystreams-types/src/activity/create.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::CreateType,
     properties::{ActivityProperties, CreateProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has created the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]

activitystreams-types/src/activity/delete.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::DeleteType,
     properties::{ActivityProperties, DeleteProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has deleted the object.
 ///

activitystreams-types/src/activity/dislike.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::DislikeType,
     properties::{ActivityProperties, DislikeProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor dislikes the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]

activitystreams-types/src/activity/flag.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::FlagType,
     properties::{ActivityProperties, FlagProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is "flagging" the object.
 ///

activitystreams-types/src/activity/follow.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::FollowType,
     properties::{ActivityProperties, FollowProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is "following" the object.
 ///

activitystreams-types/src/activity/ignore.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::IgnoreType,
     properties::{ActivityProperties, IgnoreProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is ignoring the object.
 ///

activitystreams-types/src/activity/invite.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::InviteType,
     properties::{ActivityProperties, InviteProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// A specialization of Offer in which the actor is extending an invitation for the object to the
 /// target.

activitystreams-types/src/activity/join.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::JoinType,
     properties::{ActivityProperties, JoinProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has joined the object.
 ///

activitystreams-types/src/activity/leave.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::LeaveType,
     properties::{ActivityProperties, LeaveProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has left the object.
 ///

activitystreams-types/src/activity/like.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::LikeType,
     properties::{ActivityProperties, LikeProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor likes, recommends or endorses the object.
 ///

activitystreams-types/src/activity/listen.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::ListenType,
     properties::{ActivityProperties, ListenProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has listened to the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]

activitystreams-types/src/activity/mod.rs

@@ -49,20 +49,10 @@ mod update;
 mod view;
 
 pub use self::{
-    accept::*, add::*, amove::*, announce::*, arrive::*, block::*, create::*, delete::*,
+    accept::Accept, add::Add, amove::AMove, announce::Announce, arrive::Arrive, block::Block,
-    dislike::*, flag::*, follow::*, ignore::*, invite::*, join::*, leave::*, like::*, listen::*,
+    create::Create, delete::Delete, dislike::Dislike, flag::Flag, follow::Follow, ignore::Ignore,
-    offer::*, question::*, read::*, reject::*, remove::*, tentative_accept::*, tentative_reject::*,
+    invite::Invite, join::Join, leave::Leave, like::Like, listen::Listen, offer::Offer,
-    travel::*, undo::*, update::*, view::*,
+    question::Question, read::Read, reject::Reject, remove::Remove,
+    tentative_accept::TentativeAccept, tentative_reject::TentativeReject, travel::Travel,
+    undo::Undo, update::Update, view::View,
 };
-
-use activitystreams_traits::Activity;
-
-use self::properties::ActivityProperties;
-
-/// The Activity Extension Trait
-///
-/// This trait provides generic access to an activity's properties
-pub trait ActivityExt: Activity {
-    fn props(&self) -> &ActivityProperties;
-    fn props_mut(&mut self) -> &mut ActivityProperties;
-}

activitystreams-types/src/activity/offer.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::OfferType,
     properties::{ActivityProperties, OfferProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is offering the object.
 ///

activitystreams-types/src/activity/properties.rs

@@ -24,14 +24,8 @@
 //! use activitystreams_derive::PropRefs;
 //! use activitystreams_traits::{Activity, Object};
 //! use activitystreams_types::{
-//!     activity::{
+//!     activity::properties::ActivityProperties,
-//!         properties::ActivityProperties,
+//!     object::properties::ObjectProperties,
-//!         ActivityExt,
-//!     },
-//!     object::{
-//!         properties::ObjectProperties,
-//!         ObjectExt,
-//!     },
 //! };
 //! use serde::{Deserialize, Serialize};
 //!

activitystreams-types/src/activity/question.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::QuestionType,
     properties::{ActivityProperties, QuestionProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Represents a question being asked.
 ///

activitystreams-types/src/activity/read.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::ReadType,
     properties::{ActivityProperties, ReadProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has read the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]

activitystreams-types/src/activity/reject.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::RejectType,
     properties::{ActivityProperties, RejectProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is rejecting the object.
 ///

activitystreams-types/src/activity/remove.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::RemoveType,
     properties::{ActivityProperties, RemoveProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is removing the object.
 ///

activitystreams-types/src/activity/tentative_accept.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::TentativeAcceptType,
     properties::{ActivityProperties, TentativeAcceptProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// A specialization of Accept indicating that the acceptance is tentative.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]

activitystreams-types/src/activity/tentative_reject.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::TentativeRejectType,
     properties::{ActivityProperties, TentativeRejectProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// A specialization of Reject in which the rejection is considered tentative.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]

activitystreams-types/src/activity/travel.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::TravelType,
     properties::{ActivityProperties, TravelProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is traveling to target from origin.
 ///

activitystreams-types/src/activity/undo.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::UndoType,
     properties::{ActivityProperties, UndoProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor is undoing the object.
 ///

activitystreams-types/src/activity/update.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::UpdateType,
     properties::{ActivityProperties, UpdateProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has updated the object.
 ///

activitystreams-types/src/activity/view.rs

@@ -24,9 +24,8 @@ use serde::{Deserialize, Serialize};
 use super::{
     kind::ViewType,
     properties::{ActivityProperties, ViewProperties},
-    ActivityExt,
 };
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 /// Indicates that the actor has viewed the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]

activitystreams-types/src/actor/mod.rs

@@ -23,7 +23,7 @@ use activitystreams_derive::PropRefs;
 use activitystreams_traits::{Actor, Object};
 use serde::{Deserialize, Serialize};
 
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 pub mod kind;
 use self::kind::*;

activitystreams-types/src/collection/mod.rs

@@ -23,29 +23,13 @@ use activitystreams_derive::PropRefs;
 use activitystreams_traits::{Collection, CollectionPage, Object};
 use serde::{Deserialize, Serialize};
 
-use crate::object::{properties::ObjectProperties, ObjectExt};
+use crate::object::properties::ObjectProperties;
 
 pub mod kind;
 pub mod properties;
 use self::kind::*;
 use self::properties::*;
 
-/// The Collection Extension Trait
-///
-/// This trait provides generic access to a collection's properties
-pub trait CollectionExt: Collection {
-    fn props(&self) -> &CollectionProperties;
-    fn props_mut(&mut self) -> &mut CollectionProperties;
-}
-
-/// The Collection Page Extension Trait
-///
-/// This trait provides generic access to a collection page's properties
-pub trait CollectionPageExt: CollectionPage {
-    fn props(&self) -> &CollectionPageProperties;
-    fn props_mut(&mut self) -> &mut CollectionPageProperties;
-}
-
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(transparent)]
 pub struct CollectionBox(pub Box<dyn Object>);

activitystreams-types/src/collection/properties.rs

@@ -25,14 +25,8 @@
 //! use activitystreams_derive::PropRefs;
 //! use activitystreams_traits::{Collection, Object};
 //! use activitystreams_types::{
-//!     collection::{
+//!     collection::properties::CollectionProperties,
-//!         properties::CollectionProperties,
+//!     object::properties::ObjectProperties,
-//!         CollectionExt,
-//!     },
-//!     object::{
-//!         properties::ObjectProperties,
-//!         ObjectExt,
-//!     },
 //! };
 //! use serde::{Deserialize, Serialize};
 //! use std::any::Any;

activitystreams-types/src/link/mod.rs

@@ -28,14 +28,6 @@ pub mod properties;
 use self::kind::*;
 use self::properties::*;
 
-/// The Link Extension Trait
-///
-/// This trait provides generic access to a link's properties
-pub trait LinkExt: Link {
-    fn props(&self) -> &LinkProperties;
-    fn props_mut(&mut self) -> &mut LinkProperties;
-}
-
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(transparent)]
 pub struct LinkBox(pub Box<dyn Link>);

activitystreams-types/src/link/properties.rs

@@ -24,7 +24,7 @@
 //! ```rust
 //! use activitystreams_derive::PropRefs;
 //! use activitystreams_traits::Link;
-//! use activitystreams_types::link::{properties::LinkProperties, LinkExt};
+//! use activitystreams_types::link::properties::LinkProperties;
 //! use serde::{Deserialize, Serialize};
 //! use std::any::Any;
 //!

activitystreams-types/src/object/mod.rs

@@ -28,14 +28,6 @@ pub mod properties;
 use self::kind::*;
 use self::properties::*;
 
-/// The Object Extension Trait
-///
-/// This trait provides generic access to an object's properties
-pub trait ObjectExt: Object {
-    fn props(&self) -> &ObjectProperties;
-    fn props_mut(&mut self) -> &mut ObjectProperties;
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(transparent)]
 pub struct ImageBox(pub Box<Image>);

activitystreams-types/src/object/properties.rs

@@ -24,7 +24,7 @@
 //! ```rust
 //! use activitystreams_derive::PropRefs;
 //! use activitystreams_traits::Object;
-//! use activitystreams_types::object::{properties::ObjectProperties, ObjectExt};
+//! use activitystreams_types::object::properties::ObjectProperties;
 //! use serde::{Deserialize, Serialize};
 //! use std::any::Any;
 //!

src/activity.rs

@@ -21,7 +21,7 @@
 
 pub use activitystreams_traits::{Activity, IntransitiveActivity};
 pub use activitystreams_types::activity::{
-    kind, properties, AMove, Accept, ActivityExt, Add, Announce, Arrive, Block, Create, Delete,
+    kind, properties, AMove, Accept, Add, Announce, Arrive, Block, Create, Delete, Dislike, Flag,
-    Dislike, Flag, Follow, Ignore, Invite, Join, Leave, Like, Listen, Offer, Question, Read,
+    Follow, Ignore, Invite, Join, Leave, Like, Listen, Offer, Question, Read, Reject, Remove,
-    Reject, Remove, TentativeAccept, TentativeReject, Travel, Undo, Update, View,
+    TentativeAccept, TentativeReject, Travel, Undo, Update, View,
 };

src/collection.rs

@@ -21,6 +21,6 @@
 
 pub use activitystreams_traits::{Collection, CollectionPage};
 pub use activitystreams_types::collection::{
-    kind, properties, CollectionExt, CollectionPageExt, OrderedCollection, OrderedCollectionPage,
+    kind, properties, OrderedCollection, OrderedCollectionPage, UnorderedCollection,
-    UnorderedCollection, UnorderedCollectionPage,
+    UnorderedCollectionPage,
 };

src/lib.rs

@@ -99,7 +99,6 @@
 //!         Mention,
 //!     },
 //!     Link,
-//!     LinkExt,
 //!     PropRefs,
 //!     UnitString,
 //! };
@@ -146,7 +145,7 @@
 //!     #[activitystreams(None)]
 //!     pub my_properties: MyProperties,
 //!
-//!     /// Derive AsRef/AsMut/Link/LinkExt for My -> MyProperties
+//!     /// Derive AsRef/AsMut/Link for My -> MyProperties
 //!     #[activitystreams(Link)]
 //!     pub link_properties: LinkProperties,
 //! }
@@ -172,11 +171,11 @@ pub mod link;
 pub mod object;
 
 pub use self::{
-    activity::{Activity, ActivityExt, IntransitiveActivity},
+    activity::{Activity, IntransitiveActivity},
     actor::Actor,
-    collection::{Collection, CollectionExt, CollectionPage, CollectionPageExt},
+    collection::{Collection, CollectionPage},
-    link::{Link, LinkExt},
+    link::Link,
-    object::{Object, ObjectExt},
+    object::Object,
 };
 pub use activitystreams_types::{context, primitives};
 

src/link.rs

@@ -20,4 +20,4 @@
 //! Link traits and types
 
 pub use activitystreams_traits::Link;
-pub use activitystreams_types::link::{kind, properties, LinkExt, Mention};
+pub use activitystreams_types::link::{kind, properties, Mention};

src/object.rs

@@ -21,6 +21,6 @@
 
 pub use activitystreams_traits::Object;
 pub use activitystreams_types::object::{
-    kind, properties, Article, Audio, Document, Event, Image, Note, ObjectExt, Page, Place,
+    kind, properties, Article, Audio, Document, Event, Image, Note, Page, Place, Profile,
-    Profile, Relationship, Tombstone, Video,
+    Relationship, Tombstone, Video,
 };