diff --git a/crates/puffin-cli/src/commands/pip_compile.rs b/crates/puffin-cli/src/commands/pip_compile.rs index 5ed5031bd..d497837e9 100644 --- a/crates/puffin-cli/src/commands/pip_compile.rs +++ b/crates/puffin-cli/src/commands/pip_compile.rs @@ -1,14 +1,15 @@ use std::borrow::Cow; +use std::env; use std::fmt::Write; use std::io::stdout; use std::path::Path; use std::str::FromStr; -use std::{env, fs}; use anstream::AutoStream; use anyhow::{anyhow, Result}; use chrono::{DateTime, Utc}; use colored::Colorize; +use fs_err as fs; use itertools::Itertools; use tracing::debug; @@ -191,7 +192,7 @@ pub(crate) async fn pip_compile( // Write the resolved dependencies to the output channel. let mut writer: Box = if let Some(output_file) = output_file { - Box::new(AutoStream::auto(fs::File::create(output_file)?)) + Box::new(AutoStream::auto(std::fs::File::create(output_file)?)) } else { Box::new(AutoStream::auto(stdout())) }; diff --git a/crates/puffin-dev/src/resolve_cli.rs b/crates/puffin-dev/src/resolve_cli.rs index 88f068764..fa2fc9652 100644 --- a/crates/puffin-dev/src/resolve_cli.rs +++ b/crates/puffin-dev/src/resolve_cli.rs @@ -1,10 +1,10 @@ -use std::fs; use std::io::{BufWriter, Write}; use std::path::PathBuf; use anstream::println; use anyhow::{Context, Result}; use clap::{Parser, ValueEnum}; +use fs_err as fs; use fs_err::File; use itertools::Itertools; use petgraph::dot::{Config as DotConfig, Dot}; diff --git a/crates/puffin-distribution/src/vendor/cloneable_seekable_reader.rs b/crates/puffin-distribution/src/vendor/cloneable_seekable_reader.rs index 8c83a767d..a388e42c8 100644 --- a/crates/puffin-distribution/src/vendor/cloneable_seekable_reader.rs +++ b/crates/puffin-distribution/src/vendor/cloneable_seekable_reader.rs @@ -9,7 +9,6 @@ #![allow(clippy::cast_sign_loss)] use std::{ - fs::File, io::{BufReader, Cursor, Read, Seek, SeekFrom}, sync::{Arc, Mutex}, }; @@ -117,7 +116,7 @@ impl HasLength for BufReader { } } -impl HasLength for File { +impl HasLength for std::fs::File { fn len(&self) -> u64 { self.metadata().unwrap().len() }