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

Apply anyhow patch from romain@leroux.dev

Browse source
This commit is contained in:
asonix 2019-10-28 16:04:11 -05:00
parent 435de11fe6
commit 0797fb8742
11 changed files with 31 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "activitystreams" name = "activitystreams"
description = "Activity Streams in Rust" description = "Activity Streams in Rust"
version = "0.2.4" version = "0.3.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["asonix <asonix@asonix.dog>"] authors = ["asonix <asonix@asonix.dog>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams" repository = "https://git.asonix.dog/Aardwolf/activitystreams"
@ -9,15 +9,15 @@ readme = "README.md"
keywords = ["activitystreams", "activitypub"] keywords = ["activitystreams", "activitypub"]
[dependencies] [dependencies]
activitystreams-traits = { version = "0.1", path = "activitystreams-traits" } activitystreams-traits = { version = "0.2", path = "activitystreams-traits" }
activitystreams-types = { version = "0.2.3", path = "activitystreams-types" } activitystreams-types = { version = "0.3.0", path = "activitystreams-types" }
[dev-dependencies] [dev-dependencies]
failure = "0.1" anyhow = "1.0"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
activitystreams-derive = { version = "0.1", path = "activitystreams-derive" } activitystreams-derive = { version = "0.2", path = "activitystreams-derive" }
[workspace] [workspace]
members = [ members = [

12
README.md
View file

@ -12,20 +12,19 @@ For basic use, add the following to your Cargo.toml
```toml ```toml
# Cargo.toml # Cargo.toml
activitystreams = "0.2" activitystreams = "0.3"
``` ```
And then use it in your project And then use it in your project
```rust ```rust
extern crate activitystreams; extern crate activitystreams;
extern crate failure; extern crate anyhow;
extern crate serde; extern crate serde;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;
extern crate serde_json; extern crate serde_json;
use activitystreams::{context, Object, Actor, object::Profile}; use activitystreams::{context, Object, Actor, object::Profile};
use failure::Error;
#[derive(Clone, Debug, Default, Deserialize, Serialize)] #[derive(Clone, Debug, Default, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@ -40,7 +39,7 @@ pub struct Persona {
impl Object for Persona {} impl Object for Persona {}
impl Actor for Persona {} impl Actor for Persona {}
fn run() -> Result<(), Error> { fn run() -> Result<(), anyhow::Error> {
let mut profile = Profile::default(); let mut profile = Profile::default();
profile.profile.set_describes_object(Persona { profile.profile.set_describes_object(Persona {
@ -77,7 +76,7 @@ And then in your project
extern crate activitystreams_derive; extern crate activitystreams_derive;
extern crate activitystreams_traits; extern crate activitystreams_traits;
extern crate activitystreams_types; extern crate activitystreams_types;
extern crate failure; extern crate anyhow;
extern crate serde; extern crate serde;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;
@ -85,7 +84,6 @@ extern crate serde_json;
use activitystreams_traits::{Link, Object}; use activitystreams_traits::{Link, Object};
use activitystreams_types::{CustomLink, link::Mention}; use activitystreams_types::{CustomLink, link::Mention};
use failure::Error;
/// Using the UnitString derive macro /// Using the UnitString derive macro
/// ///
@ -118,7 +116,7 @@ pub struct MyProperties {
pub required_key: serde_json::Value, pub required_key: serde_json::Value,
} }
fn run() -> Result<(), Error> { fn run() -> Result<(), anyhow::Error> {
let mut props = MyProperties::default(); let mut props = MyProperties::default();
props.set_required_key_string("Hey".to_owned())?; props.set_required_key_string("Hey".to_owned())?;

4
activitystreams-derive/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "activitystreams-derive" name = "activitystreams-derive"
description = "Derive macros for activitystreams" description = "Derive macros for activitystreams"
version = "0.1.1" version = "0.2.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["asonix <asonix.dev@gmail.com>"] authors = ["asonix <asonix.dev@gmail.com>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams" repository = "https://git.asonix.dog/Aardwolf/activitystreams"
@ -14,7 +14,7 @@ syn = "0.13"
proc-macro2 = "0.3" proc-macro2 = "0.3"
[dev-dependencies] [dev-dependencies]
activitystreams-traits = { version = "0.1", path = "../activitystreams-traits" } activitystreams-traits = { version = "0.2", path = "../activitystreams-traits" }
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"

4
activitystreams-derive/README.md
View file

@ -10,8 +10,8 @@ Add the required crates to your `Cargo.toml`
```toml ```toml
# Cargo.toml # Cargo.toml
activitystreams-derive = "0.1" activitystreams-derive = "0.2"
activitystreams-traits = "0.1" activitystreams-traits = "0.2"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"

4
activitystreams-traits/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "activitystreams-traits" name = "activitystreams-traits"
description = "Traits for ActivityStreams objects" description = "Traits for ActivityStreams objects"
version = "0.1.0" version = "0.2.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["asonix <asonix.dev@gmail.com>"] authors = ["asonix <asonix.dev@gmail.com>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams" repository = "https://git.asonix.dog/Aardwolf/activitystreams"
@ -9,9 +9,9 @@ readme = "README.md"
keywords = ["activitystreams", "activitypub"] keywords = ["activitystreams", "activitypub"]
[dependencies] [dependencies]
failure = "0.1"
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
thiserror = "1.0"
[dev-dependencies] [dev-dependencies]
serde_derive = "1.0" serde_derive = "1.0"

8
activitystreams-traits/src/error.rs
View file

@ -20,19 +20,19 @@
use std::result; use std::result;
/// The Error type /// The Error type
#[derive(Copy, Clone, Debug, Eq, Fail, PartialEq)] #[derive(Copy, Clone, Debug, Eq, PartialEq, thiserror::Error)]
pub enum Error { pub enum Error {
/// This error occurs when an Activity Streams type does not contain a requested value /// This error occurs when an Activity Streams type does not contain a requested value
#[fail(display = "Key not present")] #[error("Key not present")]
NotFound, NotFound,
/// This error occurs when a requested value could not be deserialized into the requested type /// This error occurs when a requested value could not be deserialized into the requested type
#[fail(display = "Failed to deserialize data as requested type")] #[error("Failed to deserialize data as requested type")]
Deserialize, Deserialize,
/// This error occurs when a provided item could not be serialized into an Activity Streams /// This error occurs when a provided item could not be serialized into an Activity Streams
/// type /// type
#[fail(display = "Failed to serialize data")] #[error("Failed to serialize data")]
Serialize, Serialize,
} }

2
activitystreams-traits/src/lib.rs
View file

@ -49,8 +49,6 @@
//! # fn main() {} //! # fn main() {}
//! ``` //! ```
#[macro_use]
extern crate failure;
extern crate serde; extern crate serde;
extern crate serde_json; extern crate serde_json;

8
activitystreams-types/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "activitystreams-types" name = "activitystreams-types"
description = "Base types from the Activity Streams spec" description = "Base types from the Activity Streams spec"
version = "0.2.3" version = "0.3.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["asonix <asonix@asonix.dog>"] authors = ["asonix <asonix@asonix.dog>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams" repository = "https://git.asonix.dog/Aardwolf/activitystreams"
@ -9,8 +9,8 @@ readme = "README.md"
keywords = ["activitystreams", "activitypub"] keywords = ["activitystreams", "activitypub"]
[dependencies] [dependencies]
activitystreams-derive = { version = "0.1", path = "../activitystreams-derive" } activitystreams-derive = { version = "0.2", path = "../activitystreams-derive" }
activitystreams-traits = { version = "0.1", path = "../activitystreams-traits" } activitystreams-traits = { version = "0.2", path = "../activitystreams-traits" }
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
mime = "0.3" mime = "0.3"
serde = "1.0" serde = "1.0"
@ -18,4 +18,4 @@ serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
[dev-dependencies] [dev-dependencies]
failure = "0.1" anyhow = "1.0"

2
activitystreams-types/README.md
View file

@ -10,7 +10,7 @@ First, add the crate to your cargo.toml
```toml ```toml
# Cargo.toml # Cargo.toml
activitystreams-types = "0.2" activitystreams-types = "0.3"
``` ```
Then use it in your project! Then use it in your project!

5
activitystreams-types/src/lib.rs
View file

@ -24,13 +24,12 @@
//! ## Example Usage //! ## Example Usage
//! ```rust //! ```rust
//! extern crate activitystreams_types; //! extern crate activitystreams_types;
//! extern crate failure; //! extern crate anyhow;
//! extern crate serde_json; //! extern crate serde_json;
//! //!
//! use activitystreams_types::{context, link::Mention}; //! use activitystreams_types::{context, link::Mention};
//! use failure::Error;
//! //!
//! fn run() -> Result<(), Error> { //! fn run() -> Result<(), anyhow::Error> {
//! /// A Mention is the only predefined Link type in the Activity Streams spec //! /// A Mention is the only predefined Link type in the Activity Streams spec
//! let mut mention = Mention::default(); //! let mut mention = Mention::default();
//! mention.link_props.set_context_object(context())?; //! mention.link_props.set_context_object(context())?;

10
src/lib.rs
View file

@ -27,14 +27,13 @@
//! //!
//! ```rust //! ```rust
//! extern crate activitystreams; //! extern crate activitystreams;
//! extern crate failure; //! extern crate anyhow;
//! extern crate serde; //! extern crate serde;
//! #[macro_use] //! #[macro_use]
//! extern crate serde_derive; //! extern crate serde_derive;
//! extern crate serde_json; //! extern crate serde_json;
//! //!
//! use activitystreams::{context, Object, Actor, object::Profile}; //! use activitystreams::{context, Object, Actor, object::Profile};
//! use failure::Error;
//! //!
//! #[derive(Clone, Debug, Default, Deserialize, Serialize)] //! #[derive(Clone, Debug, Default, Deserialize, Serialize)]
//! #[serde(rename_all = "camelCase")] //! #[serde(rename_all = "camelCase")]
@ -49,7 +48,7 @@
//! impl Object for Persona {} //! impl Object for Persona {}
//! impl Actor for Persona {} //! impl Actor for Persona {}
//! //!
//! fn run() -> Result<(), Error> { //! fn run() -> Result<(), anyhow::Error> {
//! let mut profile = Profile::default(); //! let mut profile = Profile::default();
//! //!
//! profile.profile.set_describes_object(Persona { //! profile.profile.set_describes_object(Persona {
@ -79,7 +78,7 @@
//! extern crate activitystreams_derive; //! extern crate activitystreams_derive;
//! extern crate activitystreams_traits; //! extern crate activitystreams_traits;
//! extern crate activitystreams_types; //! extern crate activitystreams_types;
//! extern crate failure; //! extern crate anyhow;
//! extern crate serde; //! extern crate serde;
//! #[macro_use] //! #[macro_use]
//! extern crate serde_derive; //! extern crate serde_derive;
@ -87,7 +86,6 @@
//! //!
//! use activitystreams_traits::{Link, Object}; //! use activitystreams_traits::{Link, Object};
//! use activitystreams_types::{CustomLink, link::Mention}; //! use activitystreams_types::{CustomLink, link::Mention};
//! use failure::Error;
//! //!
//! /// Using the UnitString derive macro //! /// Using the UnitString derive macro
//! /// //! ///
@ -120,7 +118,7 @@
//! pub required_key: serde_json::Value, //! pub required_key: serde_json::Value,
//! } //! }
//! //!
//! fn run() -> Result<(), Error> { //! fn run() -> Result<(), anyhow::Error> {
//! let mut props = MyProperties::default(); //! let mut props = MyProperties::default();
//! //!
//! props.set_required_key_string("Hey".to_owned())?; //! props.set_required_key_string("Hey".to_owned())?;