move relay-general macros to explicit imports

relay-general/src/lib.rs

@@ -12,7 +12,6 @@
 #[macro_use]
 extern crate relay_general_derive;
 
-#[macro_use]
 mod macros;
 
 #[cfg(test)]

relay-general/src/macros.rs

@@ -47,6 +47,8 @@ macro_rules! derive_string_meta_structure {
     };
 }
 
+pub(crate) use derive_string_meta_structure;
+
 /// Implements FromStr and Display on a flat/C-like enum such that strings roundtrip correctly and
 /// all variants can be FromStr'd.
 ///

relay-general/src/processor/attrs.rs

@@ -6,6 +6,7 @@ use enumset::{EnumSet, EnumSetType};
 use failure::Fail;
 use smallvec::SmallVec;
 
+use crate::macros::derive_fromstr_and_display;
 use crate::processor::{ProcessValue, SelectorPathItem, SelectorSpec};
 use crate::types::Annotated;
 

relay-general/src/protocol/event.rs

@@ -8,6 +8,7 @@ use schemars::schema::Schema;
 
 use serde::{Serialize, Serializer};
 
+use crate::macros::derive_string_meta_structure;
 use crate::processor::ProcessValue;
 use crate::protocol::{
     Breadcrumb, Breakdowns, ClientSdkInfo, Contexts, Csp, DebugMeta, Exception, ExpectCt,

relay-general/src/protocol/security_report.rs

@@ -11,6 +11,7 @@ use serde::de::{Error, IgnoredAny};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
+use crate::macros::derive_fromstr_and_display;
 use crate::protocol::{
     Event, HeaderName, HeaderValue, Headers, LogEntry, PairList, Request, TagEntry, Tags,
 };

relay-general/src/protocol/session.rs

@@ -5,6 +5,7 @@ use failure::Fail;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
+use crate::macros::derive_fromstr_and_display;
 use crate::protocol::IpAddr;
 
 /// The type of session event we're dealing with.

relay-general/src/types/impls.rs

@@ -2,6 +2,7 @@ use serde::ser::{SerializeMap, SerializeSeq};
 use serde::{Serialize, Serializer};
 use uuid::Uuid;
 
+use crate::macros::derive_string_meta_structure;
 use crate::types::{
     Annotated, Array, Empty, Error, FromValue, IntoValue, Map, Meta, MetaMap, MetaTree, Object,
     SkipSerialization, Value,