From 722921760e7916d47845a2fbad9af6019cf84977 Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Wed, 8 Aug 2018 14:59:52 -0700 Subject: [PATCH] Pre: Remove :: dependency from src/errors.rs --- src/errors.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/errors.rs b/src/errors.rs index 37a3be4c..a74b1851 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -71,14 +71,14 @@ pub enum MentatError { #[fail(display = "invalid vocabulary version")] InvalidVocabularyVersion, - #[fail(display = "vocabulary {}/{} already has attribute {}, and the requested definition differs", _0, _1, _2)] - ConflictingAttributeDefinitions(String, ::vocabulary::Version, String, Attribute, Attribute), + #[fail(display = "vocabulary {}/version {} already has attribute {}, and the requested definition differs", _0, _1, _2)] + ConflictingAttributeDefinitions(String, u32, String, Attribute, Attribute), - #[fail(display = "existing vocabulary {} too new: wanted {}, got {}", _0, _1, _2)] - ExistingVocabularyTooNew(String, ::vocabulary::Version, ::vocabulary::Version), + #[fail(display = "existing vocabulary {} too new: wanted version {}, got version {}", _0, _1, _2)] + ExistingVocabularyTooNew(String, u32, u32), - #[fail(display = "core schema: wanted {}, got {:?}", _0, _1)] - UnexpectedCoreSchema(::vocabulary::Version, Option<::vocabulary::Version>), + #[fail(display = "core schema: wanted version {}, got version {:?}", _0, _1)] + UnexpectedCoreSchema(u32, Option), #[fail(display = "Lost the transact() race!")] UnexpectedLostTransactRace,