Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not use a user-facing warning for "Waiting to acquire lock..." message #7502

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/uv-fs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ license = { workspace = true }
workspace = true

[dependencies]
uv-warnings = { workspace = true }

backoff = { workspace = true }
cachedir = { workspace = true }
Expand Down
8 changes: 3 additions & 5 deletions crates/uv-fs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ use fs2::FileExt;
use std::fmt::Display;
use std::path::{Path, PathBuf};
use tempfile::NamedTempFile;
use tracing::{debug, error, trace, warn};

use uv_warnings::warn_user;
use tracing::{debug, error, info, trace, warn};

pub use crate::path::*;

Expand Down Expand Up @@ -329,8 +327,8 @@ impl LockedFile {
// Log error code and enum kind to help debugging more exotic failures
// TODO(zanieb): When `raw_os_error` stabilizes, use that to avoid displaying
// the error when it is `WouldBlock`, which is expected and noisy otherwise.
trace!("Try lock error, waiting for exclusive lock: {:?}", err);
warn_user!(
trace!("Try lock error: {err:?}");
info!(
"Waiting to acquire lock for `{resource}` at `{}`",
file.path().user_display(),
);
Expand Down
Loading