mirrors/activitystreams
1
0
Fork 0
mirror of https://git.asonix.dog/asonix/activitystreams.git synced 2024-11-22 03:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace TryFrom macro impls with trait magic

Browse source
This commit is contained in:
asonix 2020-04-02 13:45:56 -05:00
parent 0e6b874d5d
commit 4ab09044ab
7 changed files with 113 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "activitystreams"
description = "Activity Streams in Rust"
version = "0.5.0-alpha.15"
version = "0.5.0-alpha.16"
license = "GPL-3.0"
authors = ["asonix <asonix@asonix.dog>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams"
@ -17,7 +17,7 @@ primitives = ["chrono", "mime", "serde", "thiserror", "url"]
types = ["derive", "kinds", "primitives"]
[dependencies]
activitystreams-derive = { version = "0.5.0-alpha.7", path = "activitystreams-derive", optional = true}
activitystreams-derive = { version = "0.5.0-alpha.8", path = "activitystreams-derive", optional = true}
chrono = { version = "0.4", optional = true }
mime = { version = "0.3", optional = true }
serde = { version = "1.0", features = ["derive"], optional = true }

4
README.md
View file

@ -9,7 +9,7 @@ __A set of Traits and Types that make up the ActivityStreams and ActivityPub spe
First, add ActivityStreams to your dependencies
```toml
activitystreams = "0.5.0-alpha.15"
activitystreams = "0.5.0-alpha.16"
```
### Types
@ -177,7 +177,7 @@ There are a number of features that can be disabled in this crate. By default, e
enabled.
```toml
activitystreams = { version = "0.5.0-alpha.15", default-features = "false", features = ["derive"] }
activitystreams = { version = "0.5.0-alpha.16", default-features = "false", features = ["derive"] }
```
| feature | what you get |

2
activitystreams-derive/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "activitystreams-derive"
description = "Derive macros for activitystreams"
version = "0.5.0-alpha.7"
version = "0.5.0-alpha.8"
license = "GPL-3.0"
authors = ["asonix <asonix.dev@gmail.com>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams"

2
activitystreams-derive/README.md
View file

@ -10,7 +10,7 @@ Add the required crates to your `Cargo.toml`
```toml
# Cargo.toml
activitystreams = "0.5.0-alpha.15"
activitystreams = "0.5.0-alpha.16"
serde = { version = "1.0", features = ["derive"] }
```

50
activitystreams-derive/src/lib.rs
View file

@ -23,8 +23,8 @@
//!
//! First, add `serde` and `activitystreams-derive` to your Cargo.toml
//! ```toml
//! activitystreams-derive = "0.5.0-alpha.7"
//! # or activitystreams = "0.5.0-alpha.15"
//! activitystreams-derive = "0.5.0-alpha.8"
//! # or activitystreams = "0.5.0-alpha.16"
//! serde = { version = "1.0", features = ["derive"] }
//! ```
//!
@ -212,29 +212,6 @@ pub fn ref_derive(input: TokenStream) -> TokenStream {
BaseBox::from_concrete(s)
}
}
impl<T> std::convert::TryFrom<Ext<#name, T>> for BaseBox
where
T: serde::de::DeserializeOwned + serde::ser::Serialize + std::fmt::Debug,
{
type Error = std::io::Error;
fn try_from(s: Ext<#name, T>) -> Result<Self, Self::Error> {
BaseBox::from_concrete(s)
}
}
impl<T, U> std::convert::TryFrom<Ext<Ext<#name, T>, U>> for BaseBox
where
T: serde::de::DeserializeOwned + serde::ser::Serialize + std::fmt::Debug,
U: serde::de::DeserializeOwned + serde::ser::Serialize + std::fmt::Debug,
{
type Error = std::io::Error;
fn try_from(s: Ext<Ext<#name, T>, U>) -> Result<Self, Self::Error> {
BaseBox::from_concrete(s)
}
}
};
let trait_impls: proc_macro2::TokenStream = input
.attrs
@ -261,29 +238,6 @@ pub fn ref_derive(input: TokenStream) -> TokenStream {
#box_name::from_concrete(s)
}
}
impl<T> std::convert::TryFrom<Ext<#name, T>> for #box_name
where
T: serde::de::DeserializeOwned + serde::ser::Serialize + std::fmt::Debug,
{
type Error = std::io::Error;
fn try_from(s: Ext<#name, T>) -> Result<Self, Self::Error> {
#box_name::from_concrete(s)
}
}
impl<T, U> std::convert::TryFrom<Ext<Ext<#name, T>, U>> for #box_name
where
T: serde::de::DeserializeOwned + serde::ser::Serialize + std::fmt::Debug,
U: serde::de::DeserializeOwned + serde::ser::Serialize + std::fmt::Debug,
{
type Error = std::io::Error;
fn try_from(s: Ext<Ext<#name, T>, U>) -> Result<Self, Self::Error> {
#box_name::from_concrete(s)
}
}
})
} else {
None

110
src/ext.rs
View file

@ -109,14 +109,14 @@
//! ```
use crate::{
activity::{Activity, IntransitiveActivity},
actor::Actor,
collection::{Collection, CollectionPage},
link::Link,
object::Object,
Base,
activity::{Activity, ActivityBox, IntransitiveActivity, IntransitiveActivityBox},
actor::{Actor, ActorBox},
collection::{Collection, CollectionBox, CollectionPage, CollectionPageBox},
link::{Link, LinkBox},
object::{Object, ObjectBox},
Base, BaseBox,
};
use std::fmt::Debug;
use std::{convert::TryFrom, fmt::Debug};
/// Defines an extension to an activitystreams object or link
///
@ -204,6 +204,102 @@ pub trait Extensible<U> {
Self: Sized;
}
impl<T, U> TryFrom<Ext<T, U>> for BaseBox
where
T: Base + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
BaseBox::from_concrete(e)
}
}
impl<T, U> TryFrom<Ext<T, U>> for ObjectBox
where
T: Object + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
ObjectBox::from_concrete(e)
}
}
impl<T, U> TryFrom<Ext<T, U>> for LinkBox
where
T: Link + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
LinkBox::from_concrete(e)
}
}
impl<T, U> TryFrom<Ext<T, U>> for CollectionBox
where
T: Collection + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
CollectionBox::from_concrete(e)
}
}
impl<T, U> TryFrom<Ext<T, U>> for CollectionPageBox
where
T: CollectionPage + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
CollectionPageBox::from_concrete(e)
}
}
impl<T, U> TryFrom<Ext<T, U>> for ActivityBox
where
T: Activity + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
ActivityBox::from_concrete(e)
}
}
impl<T, U> TryFrom<Ext<T, U>> for IntransitiveActivityBox
where
T: IntransitiveActivity + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
IntransitiveActivityBox::from_concrete(e)
}
}
impl<T, U> TryFrom<Ext<T, U>> for ActorBox
where
T: Actor + serde::ser::Serialize,
U: Extension<T> + serde::ser::Serialize + Debug,
{
type Error = std::io::Error;
fn try_from(e: Ext<T, U>) -> Result<Self, Self::Error> {
ActorBox::from_concrete(e)
}
}
impl<T, U> Extensible<U> for T
where
T: crate::Base,

4
src/lib.rs
View file

@ -25,7 +25,7 @@
//!
//! First, add ActivityStreams to your dependencies
//! ```toml
//! activitystreams = "0.5.0-alpha.15"
//! activitystreams = "0.5.0-alpha.16"
//! ```
//!
//! ### Types
@ -209,7 +209,7 @@
//! enabled.
//!
//! ```toml
//! activitystreams = { version = "0.5.0-alpha.15", default-features = "false", features = ["derive"] }
//! activitystreams = { version = "0.5.0-alpha.16", default-features = "false", features = ["derive"] }
//! ```
//!
//! | feature | what you get |