Merge branch 'asonix/2018-edition' of Aardwolf/activitystreams into master

Cargo.toml

@@ -7,6 +7,7 @@ authors = ["asonix <asonix@asonix.dog>"]
 repository = "https://git.asonix.dog/Aardwolf/activitystreams"
 readme = "README.md"
 keywords = ["activitystreams", "activitypub"]
+edition = "2018"
 
 [dependencies]
 activitystreams-traits = { version = "0.2", path = "activitystreams-traits" }

activitystreams-derive/Cargo.toml

@@ -7,11 +7,12 @@ authors = ["asonix <asonix.dev@gmail.com>"]
 repository = "https://git.asonix.dog/Aardwolf/activitystreams"
 readme = "README.md"
 keywords = ["activitystreams", "activitypub"]
+edition = "2018"
 
 [dependencies]
-quote = "0.5"
+quote = "1.0"
-syn = "0.13"
+syn = "1.0"
-proc-macro2 = "0.3"
+proc-macro2 = "1.0"
 
 [dev-dependencies]
 activitystreams-traits = { version = "0.2", path = "../activitystreams-traits" }

activitystreams-derive/src/lib.rs

@@ -22,15 +22,9 @@
 //! ## Examples
 //!
 //! ```rust
-//! #[macro_use]
+//! use activitystreams_derive::{Properties, UnitString};
-//! extern crate activitystreams_derive;
-//! extern crate activitystreams_traits;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//! extern crate serde_json;
-//!
 //! use activitystreams_traits::{Link, Object};
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! /// Using the UnitString derive macro
 //! ///
@@ -68,17 +62,14 @@
 //! ```
 
 extern crate proc_macro;
-extern crate proc_macro2;
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
 
 use proc_macro::TokenStream;
 use proc_macro2::TokenTree;
-use quote::Tokens;
+use quote::quote;
 use syn::{Attribute, Data, DeriveInput, Fields, Ident, Type};
 
+use std::iter::FromIterator;
+
 #[proc_macro_derive(UnitString, attributes(activitystreams))]
 pub fn unit_string(input: TokenStream) -> TokenStream {
     let input: DeriveInput = syn::parse(input).unwrap();
@@ -93,16 +84,14 @@ pub fn unit_string(input: TokenStream) -> TokenStream {
                 .path
                 .segments
                 .last()
-                .map(|segment| {
+                .map(|segment| segment.ident == Ident::new("activitystreams", segment.ident.span()))
-                    let segment = segment.into_value();
+                .unwrap_or(false)
-                    segment.ident == Ident::new("activitystreams", segment.ident.span())
+        })
-                }).unwrap_or(false)
+        .unwrap()
-        }).unwrap()
         .clone();
 
-    let value = from_value(attr);
+    let visitor_name = from_value(attr);
-
+    let value = format!("\"{}\"", visitor_name);
-    let visitor_name = Ident::from(format!("{}Visitor", value));
 
     let serialize = quote! {
         impl ::serde::ser::Serialize for #name {
@@ -166,15 +155,16 @@ pub fn unit_string(input: TokenStream) -> TokenStream {
     c.into()
 }
 
-fn from_value(attr: Attribute) -> String {
+fn from_value(attr: Attribute) -> Ident {
     let group = attr
-        .tts
+        .tokens
         .clone()
         .into_iter()
         .filter_map(|token_tree| match token_tree {
             TokenTree::Group(group) => Some(group),
             _ => None,
-        }).next()
+        })
+        .next()
         .unwrap();
 
     group
@@ -182,9 +172,10 @@ fn from_value(attr: Attribute) -> String {
         .clone()
         .into_iter()
         .filter_map(|token_tree| match token_tree {
-            TokenTree::Term(term) => Some(term.as_str().to_owned()),
+            TokenTree::Ident(ident) => Some(ident),
             _ => None,
-        }).next()
+        })
+        .next()
         .unwrap()
 }
 
@@ -214,7 +205,6 @@ pub fn properties_derive(input: TokenStream) -> TokenStream {
                     .segments
                     .last()
                     .map(|segment| {
-                        let segment = segment.into_value();
                         segment.ident == Ident::new("activitystreams", segment.ident.span())
                     })
                     .unwrap_or(false)
@@ -228,7 +218,6 @@ pub fn properties_derive(input: TokenStream) -> TokenStream {
                         .segments
                         .last()
                         .map(|seg| {
-                            let seg = seg.into_value();
                             seg.ident == Ident::new("Option", seg.ident.span())
                         })
                         .unwrap_or(false),
@@ -240,7 +229,6 @@ pub fn properties_derive(input: TokenStream) -> TokenStream {
                         .segments
                         .last()
                         .map(|seg| {
-                            let seg = seg.into_value();
                             seg.ident == Ident::new("Vec", seg.ident.span())
                         })
                         .unwrap_or(false),
@@ -262,12 +250,11 @@ pub fn properties_derive(input: TokenStream) -> TokenStream {
             variants(attr)
                 .into_iter()
                 .map(move |(variant, is_concrete)| {
-                    let lower_variant = variant.to_lowercase();
+                    let lower_variant = variant.to_string().to_lowercase();
-                    let fn_name = Ident::from(format!("{}_{}", ident, lower_variant));
+                    let fn_name = Ident::new(&format!("{}_{}", ident, lower_variant), variant.span());
-                    let fn_plural = Ident::from(format!("{}_{}_vec", ident, lower_variant));
+                    let fn_plural = Ident::new(&format!("{}_{}_vec", ident, lower_variant), variant.span());
-                    let set_fn_name = Ident::from(format!("set_{}_{}", ident, lower_variant));
+                    let set_fn_name = Ident::new(&format!("set_{}_{}", ident, lower_variant), variant.span());
-                    let set_fn_plural = Ident::from(format!("set_{}_{}_vec", ident, lower_variant));
+                    let set_fn_plural = Ident::new(&format!("set_{}_{}_vec", ident, lower_variant), variant.span());
-                    let variant = Ident::from(variant);
 
                     if is_concrete {
                         if is_option {
@@ -592,10 +579,9 @@ pub fn properties_derive(input: TokenStream) -> TokenStream {
                 })
         });
 
-    let mut tokens = Tokens::new();
+    let tokens = proc_macro2::TokenStream::from_iter(impls);
-    tokens.append_all(impls);
 
-    let full = quote!{
+    let full = quote! {
         impl #name {
             #tokens
         }
@@ -604,15 +590,16 @@ pub fn properties_derive(input: TokenStream) -> TokenStream {
     full.into()
 }
 
-fn variants(attr: Attribute) -> Vec<(String, bool)> {
+fn variants(attr: Attribute) -> Vec<(Ident, bool)> {
     let group = attr
-        .tts
+        .tokens
         .clone()
         .into_iter()
         .filter_map(|token_tree| match token_tree {
             TokenTree::Group(group) => Some(group),
             _ => None,
-        }).next()
+        })
+        .next()
         .unwrap();
 
     let mut is_concrete = false;
@@ -622,30 +609,32 @@ fn variants(attr: Attribute) -> Vec<(String, bool)> {
         .clone()
         .into_iter()
         .filter_map(|token_tree| match token_tree {
-            TokenTree::Term(term) => {
+            TokenTree::Ident(ident) => {
-                is_concrete = term.as_str() == "concrete";
+                is_concrete = ident.to_string() == "concrete";
                 None
             }
             TokenTree::Group(group) => Some(group.stream().into_iter().filter_map(
                 move |token_tree| match token_tree {
-                    TokenTree::Term(term) => Some((term.as_str().to_owned(), is_concrete)),
+                    TokenTree::Ident(ident) => Some((ident, is_concrete)),
                     _ => None,
                 },
             )),
             _ => None,
-        }).flat_map(|i| i)
+        })
+        .flat_map(|i| i)
         .collect()
 }
 
 fn is_functional(attr: Attribute) -> bool {
     let group = attr
-        .tts
+        .tokens
         .clone()
         .into_iter()
         .filter_map(|token_tree| match token_tree {
             TokenTree::Group(group) => Some(group),
             _ => None,
-        }).next()
+        })
+        .next()
         .unwrap();
 
     group
@@ -653,7 +642,7 @@ fn is_functional(attr: Attribute) -> bool {
         .clone()
         .into_iter()
         .any(|token_tree| match token_tree {
-            TokenTree::Term(term) => term.as_str() == "functional",
+            TokenTree::Ident(ident) => ident.to_string() == "functional",
             _ => false,
         })
 }

activitystreams-traits/Cargo.toml

@@ -7,6 +7,7 @@ authors = ["asonix <asonix.dev@gmail.com>"]
 repository = "https://git.asonix.dog/Aardwolf/activitystreams"
 readme = "README.md"
 keywords = ["activitystreams", "activitypub"]
+edition = "2018"
 
 [dependencies]
 serde = "1.0"

activitystreams-traits/src/activity.rs

@@ -17,7 +17,7 @@
  * along with ActivityStreams Traits.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use object::Object;
+use crate::object::Object;
 
 /// An Activity is a subtype of `Object` that describes some form of action that may happen, is
 /// currently happening, or has already happened.

activitystreams-traits/src/actor.rs

@@ -17,7 +17,7 @@
  * along with ActivityStreams Traits.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use object::Object;
+use crate::object::Object;
 
 /// `Actor` types are `Object` types that are capable of performing activities.
 ///

activitystreams-traits/src/collection.rs

@@ -17,7 +17,7 @@
  * along with ActivityStreams Traits.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use object::Object;
+use crate::object::Object;
 
 /// A Collection is a subtype of `Object` that represents ordered or unordered sets of `Object` or
 /// `Link` instances.

activitystreams-traits/src/lib.rs

@@ -25,13 +25,8 @@
 //! ## Examples
 //!
 //! ```rust
-//! extern crate activitystreams_traits;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//! extern crate serde_json;
-//!
 //! use activitystreams_traits::{Object, Actor};
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 //! #[serde(rename_all = "camelCase")]
@@ -49,9 +44,6 @@
 //! # fn main() {}
 //! ```
 
-extern crate serde;
-extern crate serde_json;
-
 mod activity;
 mod actor;
 mod collection;

activitystreams-traits/src/properties.rs

@@ -21,9 +21,8 @@
 //! types
 
 use serde::{de::DeserializeOwned, ser::Serialize};
-use serde_json;
 
-use error::{Error, Result};
+use crate::error::{Error, Result};
 
 /// Deserialize a `Value` into concrete type I
 pub fn from_value<I>(item: &serde_json::Value) -> Result<I>

activitystreams-types/Cargo.toml

@@ -7,6 +7,7 @@ authors = ["asonix <asonix@asonix.dog>"]
 repository = "https://git.asonix.dog/Aardwolf/activitystreams"
 readme = "README.md"
 keywords = ["activitystreams", "activitypub"]
+edition = "2018"
 
 [dependencies]
 activitystreams-derive = { version = "0.2", path = "../activitystreams-derive" }

activitystreams-types/src/activity/accept.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::AcceptType,
     properties::{AcceptProperties, ActivityProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor accepts the object.
 ///

activitystreams-types/src/activity/add.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::AddType,
     properties::{ActivityProperties, AddProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has added the object to the target.
 ///

activitystreams-types/src/activity/amove.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::MoveType,
     properties::{ActivityProperties, MoveProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has moved object from origin to target.
 ///

activitystreams-types/src/activity/announce.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::AnnounceType,
     properties::{ActivityProperties, AnnounceProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is calling the target's attention the object.
 ///

activitystreams-types/src/activity/arrive.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, IntransitiveActivity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::ArriveType,
     properties::{ActivityProperties, ArriveProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// An IntransitiveActivity that indicates that the actor has arrived at the location.
 ///

activitystreams-types/src/activity/block.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::BlockType,
     properties::{ActivityProperties, BlockProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is blocking the object.
 ///

activitystreams-types/src/activity/create.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::CreateType,
     properties::{ActivityProperties, CreateProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has created the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

activitystreams-types/src/activity/delete.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::DeleteType,
     properties::{ActivityProperties, DeleteProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has deleted the object.
 ///

activitystreams-types/src/activity/dislike.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::DislikeType,
     properties::{ActivityProperties, DislikeProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor dislikes the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

activitystreams-types/src/activity/flag.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::FlagType,
     properties::{ActivityProperties, FlagProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is "flagging" the object.
 ///

activitystreams-types/src/activity/follow.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::FollowType,
     properties::{ActivityProperties, FollowProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is "following" the object.
 ///

activitystreams-types/src/activity/ignore.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::IgnoreType,
     properties::{ActivityProperties, IgnoreProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is ignoring the object.
 ///

activitystreams-types/src/activity/invite.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::InviteType,
     properties::{ActivityProperties, InviteProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// A specialization of Offer in which the actor is extending an invitation for the object to the
 /// target.

activitystreams-types/src/activity/join.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::JoinType,
     properties::{ActivityProperties, JoinProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has joined the object.
 ///

activitystreams-types/src/activity/kind.rs

@@ -19,6 +19,8 @@
 
 //! Namespace for Unit Structs that serialize to strings
 
+use activitystreams_derive::UnitString;
+
 #[derive(Clone, Debug, Default, UnitString)]
 #[activitystreams(Accept)]
 pub struct AcceptType;

activitystreams-types/src/activity/leave.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::LeaveType,
     properties::{ActivityProperties, LeaveProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has left the object.
 ///

activitystreams-types/src/activity/like.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::LikeType,
     properties::{ActivityProperties, LikeProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor likes, recommends or endorses the object.
 ///

activitystreams-types/src/activity/listen.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::ListenType,
     properties::{ActivityProperties, ListenProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has listened to the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

activitystreams-types/src/activity/mod.rs

@@ -48,34 +48,12 @@ mod undo;
 mod update;
 mod view;
 
-pub use self::accept::*;
+pub use self::{
-pub use self::add::*;
+    accept::*, add::*, amove::*, announce::*, arrive::*, block::*, create::*, delete::*,
-pub use self::amove::*;
+    dislike::*, flag::*, follow::*, ignore::*, invite::*, join::*, leave::*, like::*, listen::*,
-pub use self::announce::*;
+    offer::*, question::*, read::*, reject::*, remove::*, tentative_accept::*, tentative_reject::*,
-pub use self::arrive::*;
+    travel::*, undo::*, update::*, view::*,
-pub use self::block::*;
+};
-pub use self::create::*;
-pub use self::delete::*;
-pub use self::dislike::*;
-pub use self::flag::*;
-pub use self::follow::*;
-pub use self::ignore::*;
-pub use self::invite::*;
-pub use self::join::*;
-pub use self::leave::*;
-pub use self::like::*;
-pub use self::listen::*;
-pub use self::offer::*;
-pub use self::question::*;
-pub use self::read::*;
-pub use self::reject::*;
-pub use self::remove::*;
-pub use self::tentative_accept::*;
-pub use self::tentative_reject::*;
-pub use self::travel::*;
-pub use self::undo::*;
-pub use self::update::*;
-pub use self::view::*;
 
 use activitystreams_traits::Activity;
 

activitystreams-types/src/activity/offer.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::OfferType,
     properties::{ActivityProperties, OfferProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is offering the object.
 ///

activitystreams-types/src/activity/properties.rs

@@ -22,17 +22,12 @@
 //! To use these properties in your own types, you can flatten them into your struct with serde:
 //!
 //! ```rust
-//! extern crate activitystreams_traits;
-//! extern crate activitystreams_types;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//!
 //! use activitystreams_traits::{Activity, Object};
 //! use activitystreams_types::{
 //!   activity::properties::ActivityProperties,
 //!   object::properties::ObjectProperties,
 //! };
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! #[derive(Clone, Debug, Serialize, Deserialize)]
 //! #[serde(rename_all = "camelCase")]
@@ -58,8 +53,9 @@
 //! # fn main() {}
 //! ```
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Link, Object};
-use serde_json;
+use serde_derive::{Deserialize, Serialize};
 
 /// Activity objects are specializations of the base Object type that provide information about
 /// actions that have either already occurred, are in the process of occurring, or may occur in the

activitystreams-types/src/activity/question.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, IntransitiveActivity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::QuestionType,
     properties::{ActivityProperties, QuestionProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Represents a question being asked.
 ///

activitystreams-types/src/activity/read.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::ReadType,
     properties::{ActivityProperties, ReadProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has read the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

activitystreams-types/src/activity/reject.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::RejectType,
     properties::{ActivityProperties, RejectProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is rejecting the object.
 ///

activitystreams-types/src/activity/remove.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::RemoveType,
     properties::{ActivityProperties, RemoveProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is removing the object.
 ///

activitystreams-types/src/activity/tentative_accept.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::TentativeAcceptType,
     properties::{ActivityProperties, TentativeAcceptProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// A specialization of Accept indicating that the acceptance is tentative.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

activitystreams-types/src/activity/tentative_reject.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::TentativeRejectType,
     properties::{ActivityProperties, TentativeRejectProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// A specialization of Reject in which the rejection is considered tentative.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

activitystreams-types/src/activity/travel.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, IntransitiveActivity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::TravelType,
     properties::{ActivityProperties, TravelProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is traveling to target from origin.
 ///

activitystreams-types/src/activity/undo.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::UndoType,
     properties::{ActivityProperties, UndoProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is undoing the object.
 ///

activitystreams-types/src/activity/update.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::UpdateType,
     properties::{ActivityProperties, UpdateProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has updated the object.
 ///

activitystreams-types/src/activity/view.rs

@@ -17,14 +17,16 @@
  * along with ActivityStreams Types.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Activity, Object};
+use serde_derive::{Deserialize, Serialize};
 
 use super::{
     kind::ViewType,
     properties::{ActivityProperties, ViewProperties},
     ActivityExt,
 };
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has viewed the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

activitystreams-types/src/actor/kind.rs

@@ -18,6 +18,7 @@
  */
 
 //! Namespace for Unit Structs that serialize to strings
+use activitystreams_derive::UnitString;
 
 #[derive(Clone, Debug, Default, UnitString)]
 #[activitystreams(Application)]

activitystreams-types/src/actor/mod.rs

@@ -20,8 +20,9 @@
 //! Namespace for Actor types
 
 use activitystreams_traits::{Actor, Object};
+use serde_derive::{Deserialize, Serialize};
 
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 pub mod kind;
 use self::kind::*;

activitystreams-types/src/collection/kind.rs

@@ -18,6 +18,7 @@
  */
 
 //! Namespace for Unit Structs that serialize to strings
+use activitystreams_derive::UnitString;
 
 #[derive(Clone, Debug, Default, UnitString)]
 #[activitystreams(Collection)]

activitystreams-types/src/collection/mod.rs

@@ -19,9 +19,11 @@
 
 //! Namespace for Collection types
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Collection, CollectionPage, Object};
+use serde_derive::{Deserialize, Serialize};
 
-use object::{properties::ObjectProperties, ObjectExt};
+use crate::object::{properties::ObjectProperties, ObjectExt};
 
 pub mod kind;
 pub mod properties;

activitystreams-types/src/collection/properties.rs

@@ -22,17 +22,12 @@
 //! To use these properties in your own types, you can flatten them into your struct with serde:
 //!
 //! ```rust
-//! extern crate activitystreams_traits;
-//! extern crate activitystreams_types;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//!
 //! use activitystreams_traits::{Collection, Object};
 //! use activitystreams_types::{
 //!   collection::properties::CollectionProperties,
 //!   object::properties::ObjectProperties,
 //! };
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! #[derive(Clone, Debug, Serialize, Deserialize)]
 //! #[serde(rename_all = "camelCase")]
@@ -56,8 +51,9 @@
 //! # fn main() {}
 //! ```
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Collection, CollectionPage, Link, Object};
-use serde_json;
+use serde_derive::{Deserialize, Serialize};
 
 /// `Collection` objects are a specialization of the base `Object` that serve as a container for
 /// other `Objects` or `Links`.

activitystreams-types/src/custom_props.rs

@@ -19,11 +19,12 @@
 
 //! A collection of simple types for extending the ActivityStreams Types base types
 
-use serde::{de::DeserializeOwned, ser::Serialize};
+use serde::{de::DeserializeOwned, ser};
 
 use activitystreams_traits::{
     Activity, Actor, Collection, CollectionPage, IntransitiveActivity, Link, Object,
 };
+use serde_derive::{Deserialize, Serialize};
 
 /// A custom type extending Link
 ///
@@ -64,7 +65,7 @@ impl<C, L: Link> CustomLink<C, L> {
 
 impl<C, L> Link for CustomLink<C, L>
 where
-    C: DeserializeOwned + Serialize,
+    C: DeserializeOwned + ser::Serialize,
     L: Link,
 {
 }
@@ -114,33 +115,37 @@ impl<C, O: Object> CustomObject<C, O> {
 
 impl<C, O> Object for CustomObject<C, O>
 where
-    C: DeserializeOwned + Serialize,
+    C: DeserializeOwned + ser::Serialize,
     O: Object,
 {
 }
 impl<C, O> Actor for CustomObject<C, O>
 where
-    C: DeserializeOwned + Serialize,
+    C: DeserializeOwned + ser::Serialize,
     O: Actor,
 {
 }
 impl<C, O> Collection for CustomObject<C, O>
 where
-    C: DeserializeOwned + Serialize,
+    C: DeserializeOwned + ser::Serialize,
     O: Collection,
-{}
+{
+}
 impl<C, O> CollectionPage for CustomObject<C, O>
 where
-    C: DeserializeOwned + Serialize,
+    C: DeserializeOwned + ser::Serialize,
     O: CollectionPage,
-{}
+{
+}
 impl<C, O> Activity for CustomObject<C, O>
 where
-    C: DeserializeOwned + Serialize,
+    C: DeserializeOwned + ser::Serialize,
     O: Activity,
-{}
+{
+}
 impl<C, O> IntransitiveActivity for CustomObject<C, O>
 where
-    C: DeserializeOwned + Serialize,
+    C: DeserializeOwned + ser::Serialize,
     O: IntransitiveActivity,
-{}
+{
+}

activitystreams-types/src/lib.rs

@@ -23,10 +23,6 @@
 //!
 //! ## Example Usage
 //! ```rust
-//! extern crate activitystreams_types;
-//! extern crate anyhow;
-//! extern crate serde_json;
-//!
 //! use activitystreams_types::{context, link::Mention};
 //!
 //! fn run() -> Result<(), anyhow::Error> {
@@ -46,15 +42,7 @@
 //! # }
 //! ```
 
-#[macro_use]
+use serde_derive::{Deserialize, Serialize};
-extern crate activitystreams_derive;
-extern crate activitystreams_traits;
-extern crate chrono;
-extern crate mime;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
 
 /// Define a simple wrapper around a string for this crate's main Context type
 #[derive(Clone, Debug, Deserialize, Serialize)]

activitystreams-types/src/link/kind.rs

@@ -18,6 +18,7 @@
  */
 
 //! Namespace for Unit Structs that serialize to strings
+use activitystreams_derive::UnitString;
 
 /// A Unit Struct that represents the string "Mention"
 #[derive(Clone, Debug, Default, UnitString)]

activitystreams-types/src/link/mod.rs

@@ -20,6 +20,7 @@
 //! Namespace for Link types
 
 use activitystreams_traits::Link;
+use serde_derive::{Deserialize, Serialize};
 
 pub mod kind;
 pub mod properties;

activitystreams-types/src/link/properties.rs

@@ -22,14 +22,9 @@
 //! To use these properties in your own types, you can flatten them into your struct with serde:
 //!
 //! ```rust
-//! extern crate activitystreams_traits;
-//! extern crate activitystreams_types;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//!
 //! use activitystreams_traits::Link;
 //! use activitystreams_types::link::properties::LinkProperties;
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! #[derive(Clone, Debug, Serialize, Deserialize)]
 //! #[serde(rename_all = "camelCase")]
@@ -49,9 +44,9 @@
 //! # fn main() {}
 //! ```
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Error, Link, Object, Result};
-use mime;
+use serde_derive::{Deserialize, Serialize};
-use serde_json;
 
 /// Define all the properties of the Object base type as described by the Activity Streams
 /// vocabulary.

activitystreams-types/src/object/kind.rs

@@ -18,6 +18,7 @@
  */
 
 //! Namespace for Unit Structs that serialize to strings
+use activitystreams_derive::UnitString;
 
 /// A Unit Struct that represents the string "Article"
 #[derive(Clone, Debug, Default, UnitString)]

activitystreams-types/src/object/mod.rs

@@ -19,7 +19,9 @@
 
 //! Namespace for Object types
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::Object;
+use serde_derive::{Deserialize, Serialize};
 
 pub mod kind;
 pub mod properties;

activitystreams-types/src/object/properties.rs

@@ -22,14 +22,9 @@
 //! To use these properties in your own types, you can flatten them into your struct with serde:
 //!
 //! ```rust
-//! extern crate activitystreams_traits;
-//! extern crate activitystreams_types;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//!
 //! use activitystreams_traits::Object;
 //! use activitystreams_types::object::properties::ObjectProperties;
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! #[derive(Clone, Debug, Serialize, Deserialize)]
 //! #[serde(rename_all = "camelCase")]
@@ -49,12 +44,12 @@
 //! # fn main() {}
 //! ```
 
+use activitystreams_derive::Properties;
 use activitystreams_traits::{Collection, Error, Link, Object, Result};
 use chrono::{offset::Utc, DateTime};
-use mime;
+use serde_derive::{Deserialize, Serialize};
-use serde_json;
 
-use object::Image;
+use crate::object::Image;
 
 /// Alias chrono::DateTime<Utc> for use in derive macros
 pub type UtcTime = DateTime<Utc>;

src/lib.rs

@@ -26,14 +26,8 @@
 //! ### Basic
 //!
 //! ```rust
-//! extern crate activitystreams;
-//! extern crate anyhow;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//! extern crate serde_json;
-//!
 //! use activitystreams::{context, Object, Actor, object::Profile};
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 //! #[serde(rename_all = "camelCase")]
@@ -74,18 +68,10 @@
 //! ### Advanced
 //!
 //! ```rust
-//! #[macro_use]
+//! use activitystreams_derive::{Properties, UnitString};
-//! extern crate activitystreams_derive;
-//! extern crate activitystreams_traits;
-//! extern crate activitystreams_types;
-//! extern crate anyhow;
-//! extern crate serde;
-//! #[macro_use]
-//! extern crate serde_derive;
-//! extern crate serde_json;
-//!
 //! use activitystreams_traits::{Link, Object};
 //! use activitystreams_types::{CustomLink, link::Mention};
+//! use serde_derive::{Deserialize, Serialize};
 //!
 //! /// Using the UnitString derive macro
 //! ///
@@ -136,9 +122,6 @@
 //! # }
 //! ```
 
-extern crate activitystreams_traits;
-extern crate activitystreams_types;
-
 pub mod activity;
 pub mod actor;
 pub mod collection;