Merge pull request #30 from graphql-rust/errors

tailhook · web-flow · commit 65b02500837f · 2020-03-15T12:38:18.000+02:00
Use `thiserror` crate instead of `failure`
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ edition = "2018"
 
 [dependencies]
 combine = "3.2.0"
-failure = "0.1.1"
+thiserror = "1.0.11"
 
 [dev-dependencies]
 pretty_assertions = "0.5.0"
diff --git a/src/lib.rs b/src/lib.rs
@@ -20,11 +20,10 @@
 //! -------------------------------
 //!
 //! ```rust
-//! # extern crate failure;
 //! # extern crate graphql_parser;
-//! use graphql_parser::parse_query;
+//! use graphql_parser::query::{parse_query, ParseError};
 //!
-//! # fn parse() -> Result<(), failure::Error> {
+//! # fn parse() -> Result<(), ParseError> {
 //! let ast = parse_query::<&str>("query MyQuery { field1, field2 }")?;
 //! // Format canonical representation
 //! assert_eq!(format!("{}", ast), "\
@@ -44,11 +43,10 @@
 //! --------------------------------
 //!
 //! ```rust
-//! # extern crate failure;
 //! # extern crate graphql_parser;
-//! use graphql_parser::parse_schema;
+//! use graphql_parser::schema::{parse_schema, ParseError};
 //!
-//! # fn parse() -> Result<(), failure::Error> {
+//! # fn parse() -> Result<(), ParseError> {
 //! let ast = parse_schema::<String>(r#"
 //!     schema {
 //!         query: Query
@@ -93,7 +91,6 @@
 //!
 #![warn(missing_debug_implementations)]
 
-#[macro_use] extern crate failure;
 #[cfg(test)] #[macro_use] extern crate pretty_assertions;
 
 
diff --git a/src/query/error.rs b/src/query/error.rs
@@ -1,4 +1,5 @@
 use combine::easy::Errors;
+use thiserror::Error;
 
 use crate::tokenizer::Token;
 use crate::position::Pos;
@@ -10,8 +11,8 @@ pub type InternalError<'a> = Errors<Token<'a>, Token<'a>, Pos>;
 ///
 /// This structure is opaque for forward compatibility. We are exploring a
 /// way to improve both error message and API.
-#[derive(Fail, Debug)]
-#[fail(display="query parse error: {}", _0)]
+#[derive(Error, Debug)]
+#[error("query parse error: {}", _0)]
 pub struct ParseError(String);
 
 impl<'a> From<InternalError<'a>> for ParseError {
diff --git a/src/schema/ast.rs b/src/schema/ast.rs
@@ -1,10 +1,12 @@
 use std::str::FromStr;
 
+use thiserror::Error;
+
 pub use crate::common::{Directive, Type, Value, Text};
 use crate::position::Pos;
 
 #[derive(Debug, Clone, Default, PartialEq)]
-pub struct Document<'a, T: Text<'a>> 
+pub struct Document<'a, T: Text<'a>>
     where T: Text<'a>
 {
     pub definitions: Vec<Definition<'a, T>>,
@@ -55,7 +57,7 @@ pub struct ScalarType<'a, T: Text<'a>> {
     pub directives: Vec<Directive<'a, T>>,
 }
 
-impl<'a, T> ScalarType<'a, T> 
+impl<'a, T> ScalarType<'a, T>
     where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -75,7 +77,7 @@ pub struct ScalarTypeExtension<'a, T: Text<'a>> {
     pub directives: Vec<Directive<'a, T>>,
 }
 
-impl<'a, T> ScalarTypeExtension<'a, T> 
+impl<'a, T> ScalarTypeExtension<'a, T>
     where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -97,7 +99,7 @@ pub struct ObjectType<'a, T: Text<'a>> {
     pub fields: Vec<Field<'a, T>>,
 }
 
-impl<'a, T> ObjectType<'a, T> 
+impl<'a, T> ObjectType<'a, T>
     where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -121,7 +123,7 @@ pub struct ObjectTypeExtension<'a, T: Text<'a>> {
     pub fields: Vec<Field<'a, T>>,
 }
 
-impl<'a, T> ObjectTypeExtension<'a, T> 
+impl<'a, T> ObjectTypeExtension<'a, T>
     where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -164,7 +166,7 @@ pub struct InterfaceType<'a, T: Text<'a>> {
     pub fields: Vec<Field<'a, T>>,
 }
 
-impl<'a, T> InterfaceType<'a, T> 
+impl<'a, T> InterfaceType<'a, T>
     where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -186,7 +188,7 @@ pub struct InterfaceTypeExtension<'a, T: Text<'a>> {
     pub fields: Vec<Field<'a, T>>,
 }
 
-impl<'a, T> InterfaceTypeExtension<'a, T> 
+impl<'a, T> InterfaceTypeExtension<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -208,7 +210,7 @@ pub struct UnionType<'a, T: Text<'a>> {
     pub types: Vec<T::Value>,
 }
 
-impl<'a, T> UnionType<'a, T> 
+impl<'a, T> UnionType<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -230,7 +232,7 @@ pub struct UnionTypeExtension<'a, T: Text<'a>> {
     pub types: Vec<T::Value>,
 }
 
-impl<'a, T> UnionTypeExtension<'a, T> 
+impl<'a, T> UnionTypeExtension<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -252,7 +254,7 @@ pub struct EnumType<'a, T: Text<'a>> {
     pub values: Vec<EnumValue<'a, T>>,
 }
 
-impl<'a, T> EnumType<'a, T> 
+impl<'a, T> EnumType<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -274,7 +276,7 @@ pub struct EnumValue<'a, T: Text<'a>> {
     pub directives: Vec<Directive<'a, T>>,
 }
 
-impl<'a, T> EnumValue<'a, T> 
+impl<'a, T> EnumValue<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -295,7 +297,7 @@ pub struct EnumTypeExtension<'a, T: Text<'a>> {
     pub values: Vec<EnumValue<'a, T>>,
 }
 
-impl<'a, T> EnumTypeExtension<'a, T> 
+impl<'a, T> EnumTypeExtension<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -317,7 +319,7 @@ pub struct InputObjectType<'a, T: Text<'a>> {
     pub fields: Vec<InputValue<'a, T>>,
 }
 
-impl<'a, T> InputObjectType<'a, T> 
+impl<'a, T> InputObjectType<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -339,7 +341,7 @@ pub struct InputObjectTypeExtension<'a, T: Text<'a>> {
     pub fields: Vec<InputValue<'a, T>>,
 }
 
-impl<'a, T> InputObjectTypeExtension<'a, T> 
+impl<'a, T> InputObjectTypeExtension<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -386,7 +388,7 @@ pub struct DirectiveDefinition<'a, T: Text<'a>> {
     pub locations: Vec<DirectiveLocation>,
 }
 
-impl<'a, T> DirectiveDefinition<'a, T> 
+impl<'a, T> DirectiveDefinition<'a, T>
 where T: Text<'a>
 {
     pub fn new(name: T::Value) -> Self {
@@ -460,8 +462,8 @@ impl DirectiveLocation {
     }
 }
 
-#[derive(Debug, Fail)]
-#[fail(display = "invalid directive location")]
+#[derive(Debug, Error)]
+#[error("invalid directive location")]
 pub struct InvalidDirectiveLocation;
 
 
diff --git a/src/schema/error.rs b/src/schema/error.rs
@@ -1,4 +1,5 @@
 use combine::easy::Errors;
+use thiserror::Error;
 
 use crate::tokenizer::Token;
 use crate::position::Pos;
@@ -10,8 +11,8 @@ pub type InternalError<'a> = Errors<Token<'a>, Token<'a>, Pos>;
 ///
 /// This structure is opaque for forward compatibility. We are exploring a
 /// way to improve both error message and API.
-#[derive(Fail, Debug)]
-#[fail(display="schema parse error: {}", _0)]
+#[derive(Error, Debug)]
+#[error("schema parse error: {}", _0)]
 pub struct ParseError(String);
 
 impl<'a> From<InternalError<'a>> for ParseError {
diff --git a/src/schema/grammar.rs b/src/schema/grammar.rs
@@ -3,7 +3,6 @@ use combine::easy::{Error, Errors};
 use combine::error::StreamError;
 use combine::combinator::{many, many1, eof, optional, position, choice};
 use combine::combinator::{sep_by1};
-use failure::Fail;
 
 use crate::tokenizer::{Kind as T, Token, TokenStream};
 use crate::helpers::{punct, ident, kind, name};
@@ -460,8 +459,7 @@ pub fn directive_locations<'a>(input: &mut TokenStream<'a>)
         optional(punct("|"))
         .with(sep_by1(
             kind(T::Name)
-                .and_then(|tok| tok.value.parse::<DirectiveLocation>()
-                                .map_err(|e| e.compat())),
+                .and_then(|tok| tok.value.parse::<DirectiveLocation>()),
             punct("|")))
     )
         .map(|opt| opt.unwrap_or_else(Vec::new))
@@ -558,7 +556,7 @@ pub fn definition<'a, T>(input: &mut TokenStream<'a>)
 }
 
 /// Parses a piece of schema language and returns an AST
-pub fn parse_schema<'a, T>(s: &'a str) -> Result<Document<'a, T>, ParseError> 
+pub fn parse_schema<'a, T>(s: &'a str) -> Result<Document<'a, T>, ParseError>
     where T: Text<'a>,
 {
     let mut tokens = TokenStream::new(s);

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`use std::str::FromStr;`
`2`	`2`
	`3`	`+use thiserror::Error;`
	`4`	`+`
`3`	`5`	`pub use crate::common::{Directive, Type, Value, Text};`
`4`	`6`	`use crate::position::Pos;`
`5`	`7`
`6`	`8`	`#[derive(Debug, Clone, Default, PartialEq)]`
`7`		`-pub struct Document<'a, T: Text<'a>>`
	`9`	`+pub struct Document<'a, T: Text<'a>>`
`8`	`10`	`where T: Text<'a>`
`9`	`11`	`{`
`10`	`12`	`pub definitions: Vec<Definition<'a, T>>,`
`@@ -55,7 +57,7 @@ pub struct ScalarType<'a, T: Text<'a>> {`
`55`	`57`	`pub directives: Vec<Directive<'a, T>>,`
`56`	`58`	`}`
`57`	`59`
`58`		`-impl<'a, T> ScalarType<'a, T>`
	`60`	`+impl<'a, T> ScalarType<'a, T>`
`59`	`61`	`where T: Text<'a>`
`60`	`62`	`{`
`61`	`63`	`pub fn new(name: T::Value) -> Self {`
`@@ -75,7 +77,7 @@ pub struct ScalarTypeExtension<'a, T: Text<'a>> {`
`75`	`77`	`pub directives: Vec<Directive<'a, T>>,`
`76`	`78`	`}`
`77`	`79`
`78`		`-impl<'a, T> ScalarTypeExtension<'a, T>`
	`80`	`+impl<'a, T> ScalarTypeExtension<'a, T>`
`79`	`81`	`where T: Text<'a>`
`80`	`82`	`{`
`81`	`83`	`pub fn new(name: T::Value) -> Self {`
`@@ -97,7 +99,7 @@ pub struct ObjectType<'a, T: Text<'a>> {`
`97`	`99`	`pub fields: Vec<Field<'a, T>>,`
`98`	`100`	`}`
`99`	`101`
`100`		`-impl<'a, T> ObjectType<'a, T>`
	`102`	`+impl<'a, T> ObjectType<'a, T>`
`101`	`103`	`where T: Text<'a>`
`102`	`104`	`{`
`103`	`105`	`pub fn new(name: T::Value) -> Self {`
`@@ -121,7 +123,7 @@ pub struct ObjectTypeExtension<'a, T: Text<'a>> {`
`121`	`123`	`pub fields: Vec<Field<'a, T>>,`
`122`	`124`	`}`
`123`	`125`
`124`		`-impl<'a, T> ObjectTypeExtension<'a, T>`
	`126`	`+impl<'a, T> ObjectTypeExtension<'a, T>`
`125`	`127`	`where T: Text<'a>`
`126`	`128`	`{`
`127`	`129`	`pub fn new(name: T::Value) -> Self {`
`@@ -164,7 +166,7 @@ pub struct InterfaceType<'a, T: Text<'a>> {`
`164`	`166`	`pub fields: Vec<Field<'a, T>>,`
`165`	`167`	`}`
`166`	`168`
`167`		`-impl<'a, T> InterfaceType<'a, T>`
	`169`	`+impl<'a, T> InterfaceType<'a, T>`
`168`	`170`	`where T: Text<'a>`
`169`	`171`	`{`
`170`	`172`	`pub fn new(name: T::Value) -> Self {`
`@@ -186,7 +188,7 @@ pub struct InterfaceTypeExtension<'a, T: Text<'a>> {`
`186`	`188`	`pub fields: Vec<Field<'a, T>>,`
`187`	`189`	`}`
`188`	`190`
`189`		`-impl<'a, T> InterfaceTypeExtension<'a, T>`
	`191`	`+impl<'a, T> InterfaceTypeExtension<'a, T>`
`190`	`192`	`where T: Text<'a>`
`191`	`193`	`{`
`192`	`194`	`pub fn new(name: T::Value) -> Self {`
`@@ -208,7 +210,7 @@ pub struct UnionType<'a, T: Text<'a>> {`
`208`	`210`	`pub types: Vec<T::Value>,`
`209`	`211`	`}`
`210`	`212`
`211`		`-impl<'a, T> UnionType<'a, T>`
	`213`	`+impl<'a, T> UnionType<'a, T>`
`212`	`214`	`where T: Text<'a>`
`213`	`215`	`{`
`214`	`216`	`pub fn new(name: T::Value) -> Self {`
`@@ -230,7 +232,7 @@ pub struct UnionTypeExtension<'a, T: Text<'a>> {`
`230`	`232`	`pub types: Vec<T::Value>,`
`231`	`233`	`}`
`232`	`234`
`233`		`-impl<'a, T> UnionTypeExtension<'a, T>`
	`235`	`+impl<'a, T> UnionTypeExtension<'a, T>`
`234`	`236`	`where T: Text<'a>`
`235`	`237`	`{`
`236`	`238`	`pub fn new(name: T::Value) -> Self {`
`@@ -252,7 +254,7 @@ pub struct EnumType<'a, T: Text<'a>> {`
`252`	`254`	`pub values: Vec<EnumValue<'a, T>>,`
`253`	`255`	`}`
`254`	`256`
`255`		`-impl<'a, T> EnumType<'a, T>`
	`257`	`+impl<'a, T> EnumType<'a, T>`
`256`	`258`	`where T: Text<'a>`
`257`	`259`	`{`
`258`	`260`	`pub fn new(name: T::Value) -> Self {`
`@@ -274,7 +276,7 @@ pub struct EnumValue<'a, T: Text<'a>> {`
`274`	`276`	`pub directives: Vec<Directive<'a, T>>,`
`275`	`277`	`}`
`276`	`278`
`277`		`-impl<'a, T> EnumValue<'a, T>`
	`279`	`+impl<'a, T> EnumValue<'a, T>`
`278`	`280`	`where T: Text<'a>`
`279`	`281`	`{`
`280`	`282`	`pub fn new(name: T::Value) -> Self {`
`@@ -295,7 +297,7 @@ pub struct EnumTypeExtension<'a, T: Text<'a>> {`
`295`	`297`	`pub values: Vec<EnumValue<'a, T>>,`
`296`	`298`	`}`
`297`	`299`
`298`		`-impl<'a, T> EnumTypeExtension<'a, T>`
	`300`	`+impl<'a, T> EnumTypeExtension<'a, T>`
`299`	`301`	`where T: Text<'a>`
`300`	`302`	`{`
`301`	`303`	`pub fn new(name: T::Value) -> Self {`
`@@ -317,7 +319,7 @@ pub struct InputObjectType<'a, T: Text<'a>> {`
`317`	`319`	`pub fields: Vec<InputValue<'a, T>>,`
`318`	`320`	`}`
`319`	`321`
`320`		`-impl<'a, T> InputObjectType<'a, T>`
	`322`	`+impl<'a, T> InputObjectType<'a, T>`
`321`	`323`	`where T: Text<'a>`
`322`	`324`	`{`
`323`	`325`	`pub fn new(name: T::Value) -> Self {`
`@@ -339,7 +341,7 @@ pub struct InputObjectTypeExtension<'a, T: Text<'a>> {`
`339`	`341`	`pub fields: Vec<InputValue<'a, T>>,`
`340`	`342`	`}`
`341`	`343`
`342`		`-impl<'a, T> InputObjectTypeExtension<'a, T>`
	`344`	`+impl<'a, T> InputObjectTypeExtension<'a, T>`
`343`	`345`	`where T: Text<'a>`
`344`	`346`	`{`
`345`	`347`	`pub fn new(name: T::Value) -> Self {`
`@@ -386,7 +388,7 @@ pub struct DirectiveDefinition<'a, T: Text<'a>> {`
`386`	`388`	`pub locations: Vec<DirectiveLocation>,`
`387`	`389`	`}`
`388`	`390`
`389`		`-impl<'a, T> DirectiveDefinition<'a, T>`
	`391`	`+impl<'a, T> DirectiveDefinition<'a, T>`
`390`	`392`	`where T: Text<'a>`
`391`	`393`	`{`
`392`	`394`	`pub fn new(name: T::Value) -> Self {`
`@@ -460,8 +462,8 @@ impl DirectiveLocation {`
`460`	`462`	`}`
`461`	`463`	`}`
`462`	`464`
`463`		`-#[derive(Debug, Fail)]`
`464`		`-#[fail(display = "invalid directive location")]`
	`465`	`+#[derive(Debug, Error)]`
	`466`	`+#[error("invalid directive location")]`
`465`	`467`	`pub struct InvalidDirectiveLocation;`
`466`	`468`
`467`	`469`