Fix compile errors and warnings on Windows

The resolve_test tests failed to compile locally, not sure why
this isn't happening in CI.

Signed-off-by: J Robert Ray <[email protected]>

Author: jrray

crates/spfs/src/repeating_timeout.rs

@@ -12,8 +12,10 @@ use core::task::{Context, Poll};
 use std::fmt;
 use std::time::Duration;
 
+#[cfg(unix)]
+use futures::StreamExt;
 use futures::stream::Fuse;
-use futures::{Future, Stream, StreamExt, ready};
+use futures::{Future, Stream, ready};
 use pin_project_lite::pin_project;
 use tokio::time::{Instant, Sleep};
 

crates/spfs/src/resolve.rs

@@ -2,20 +2,27 @@
 // SPDX-License-Identifier: Apache-2.0
 // https://github.com/spkenv/spk
 
+#[cfg(unix)]
 use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 
 use futures::{FutureExt, TryFutureExt, TryStreamExt};
 use itertools::Itertools;
+#[cfg(unix)]
 use nonempty::NonEmpty;
 use serde::{Deserialize, Serialize};
 
 use super::config::get_config;
+#[cfg(unix)]
 use crate::config::OverlayFsOptions;
 use crate::prelude::*;
+#[cfg(unix)]
+use crate::runtime;
+#[cfg(unix)]
 use crate::storage::fallback::FallbackProxy;
+#[cfg(unix)]
 use crate::storage::fs::{CliRenderType, ManifestRenderPath, RenderSummary};
-use crate::{Error, Result, graph, runtime, storage, tracking};
+use crate::{Error, Result, graph, storage, tracking};
 
 #[cfg(test)]
 #[path = "./resolve_test.rs"]

crates/spfs/src/resolve_test.rs

@@ -2,15 +2,19 @@
 // SPDX-License-Identifier: Apache-2.0
 // https://github.com/spkenv/spk
 
+#[cfg(unix)]
 use std::sync::Arc;
 
 use rstest::rstest;
 
 use super::resolve_stack_to_layers;
 use crate::fixtures::*;
+#[cfg(unix)]
+use crate::io;
+#[cfg(unix)]
 use crate::io::DigestFormat;
 use crate::prelude::*;
-use crate::{encoding, graph, io};
+use crate::{encoding, graph};
 
 #[rstest]
 #[tokio::test]
@@ -26,6 +30,8 @@ async fn test_stack_to_layers_dedupe(#[future] tmprepo: TempRepo) {
     assert_eq!(resolved.len(), 1, "should deduplicate layers in resolve");
 }
 
+// `resolve_overlay_dirs` only exists on unix
+#[cfg(unix)]
 /// Test that if there are too many layers to fit on a single mount
 /// that enough layers are merged together so the mount will succeed.
 #[rstest]
@@ -81,6 +87,8 @@ async fn test_auto_merge_layers(tmpdir: tempfile::TempDir) {
     );
 }
 
+// `resolve_overlay_dirs` only exists on unix
+#[cfg(unix)]
 /// Test that if there are too many layers to fit on a single mount
 /// and the topmost layer contains an edit of the next top most layer
 /// that after merging layers the edit remains in the merged layer

crates/spfs/src/runtime/startup_ps.rs

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // https://github.com/spkenv/spk
 
-use itertools::Itertools;
-
 use super::EnvKeyValue;
 
 pub fn source(_environment_overrides: &[EnvKeyValue]) -> String {

crates/spk-cli/common/src/flags.rs

@@ -38,6 +38,7 @@ use spk_schema::ident::{
 };
 use spk_schema::option_map::HOST_OPTIONS;
 use spk_schema::{Recipe, SpecFileData, SpecRecipe, Template, TestStage, VariantExt};
+#[cfg(unix)]
 #[cfg(feature = "statsd")]
 use spk_solve::{SPK_RUN_TIME_METRIC, get_metrics_client};
 use spk_workspace::{FindOrLoadPackageTemplateError, FindPackageTemplateError};