Rust 1.13.0 macro parsing workaround

serde-rs · Apr 5, 2017 · 11c8969 · 11c8969
1 parent 3cc14c2
commit 11c8969
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs
@@ -122,7 +122,7 @@ pub use self::ignored_any::IgnoredAny;
 ///////////////////////////////////////////////////////////////////////////////
 
 macro_rules! declare_error_trait {
-    (Error: Sized $(+ $supertrait:path)*) => {
+    (Error: Sized $(+ $($supertrait:ident)::*)*) => {
         /// The `Error` trait allows `Deserialize` implementations to create descriptive
         /// error messages belonging to the `Deserializer` against which they are
         /// currently running.
@@ -136,7 +136,7 @@ macro_rules! declare_error_trait {
         ///
         /// Most deserializers should only need to provide the `Error::custom` method
         /// and inherit the default behavior for the other methods.
-        pub trait Error: Sized $(+ $supertrait)* {
+        pub trait Error: Sized $(+ $($supertrait)::*)* {
             /// Raised when there is general error when deserializing a type.
             ///
             /// The message should not be capitalized and should not end with a period.

diff --git a/serde/src/ser/mod.rs b/serde/src/ser/mod.rs
@@ -116,11 +116,11 @@ pub use self::impossible::Impossible;
 ///////////////////////////////////////////////////////////////////////////////
 
 macro_rules! declare_error_trait {
-    (Error: Sized $(+ $supertrait:path)*) => {
+    (Error: Sized $(+ $($supertrait:ident)::*)*) => {
         /// Trait used by `Serialize` implementations to generically construct
         /// errors belonging to the `Serializer` against which they are
         /// currently running.
-        pub trait Error: Sized $(+ $supertrait)* {
+        pub trait Error: Sized $(+ $($supertrait)::*)* {
             /// Raised when a `Serialize` implementation encounters a general
             /// error while serializing a type.
             ///