review: schemars std + extra feature tagging

oxidecomputer · Jul 10, 2024 · 7a61342 · 7a61342
1 parent 1b1fa67
commit 7a61342
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/oximeter/db/src/lib.rs b/oximeter/db/src/lib.rs
@@ -7,6 +7,7 @@
 // Copyright 2024 Oxide Computer Company
 
 use crate::query::StringFieldSelector;
+#[cfg(any(feature = "oxql", feature = "sql", feature = "oxdb", test))]
 use anyhow::Context as _;
 use chrono::DateTime;
 use chrono::Utc;
@@ -24,12 +25,13 @@ pub use oximeter::Sample;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
+#[cfg(any(feature = "oxql", feature = "sql", feature = "oxdb", test))]
 use slog::Logger;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::io;
-use std::net::IpAddr;
-use std::net::SocketAddr;
+#[cfg(any(feature = "oxql", feature = "sql", feature = "oxdb", test))]
+use std::net::{IpAddr, SocketAddr};
 use std::num::NonZeroU32;
 use std::path::PathBuf;
 use thiserror::Error;

diff --git a/uuid-kinds/Cargo.toml b/uuid-kinds/Cargo.toml
@@ -19,6 +19,6 @@ paste.workspace = true
 [features]
 default = ["std"]
 serde = ["newtype-uuid/serde"]
-schemars08 = ["newtype-uuid/schemars08", "schemars"]
+schemars08 = ["newtype-uuid/schemars08", "schemars", "std"]
 std = ["newtype-uuid/std"]
 uuid-v4 = ["newtype-uuid/v4"]
diff --git a/uuid-kinds/src/lib.rs b/uuid-kinds/src/lib.rs
@@ -14,14 +14,14 @@ pub use newtype_uuid::{
     GenericUuid, ParseError, TagError, TypedUuid, TypedUuidKind, TypedUuidTag,
 };
 
-#[cfg(all(feature = "schemars08", feature = "std"))]
+#[cfg(feature = "schemars08")]
 use schemars::JsonSchema;
 
 macro_rules! impl_typed_uuid_kind {
     ($($kind:ident => $tag:literal),* $(,)?) => {
         $(
             paste::paste! {
-                #[cfg_attr(all(feature = "schemars08", feature = "std"), derive(JsonSchema))]
+                #[cfg_attr(feature = "schemars08", derive(JsonSchema))]
                 pub enum [< $kind Kind>] {}
 
                 impl TypedUuidKind for [< $kind Kind >] {