From 3060fd22c00c3f5ca96374747600c8b4bab6a896 Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Sat, 14 Sep 2024 00:09:15 -0400
Subject: [PATCH] Remove duplicate warning for settings discovery errors
 (#7384)

## Summary

These are often (but not always) duplicated, and I find it really janky.
This PR makes them tracing warnings instead.
---
 crates/uv-settings/src/lib.rs    | 8 ++++----
 crates/uv/tests/lock.rs          | 7 -------
 crates/uv/tests/pip_compile.rs   | 9 ---------
 crates/uv/tests/pip_install.rs   | 7 -------
 crates/uv/tests/show_settings.rs | 1 -
 crates/uv/tests/venv.rs          | 7 -------
 6 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/crates/uv-settings/src/lib.rs b/crates/uv-settings/src/lib.rs
index 0edb30e6fd12..6deb4c6ae0c7 100644
--- a/crates/uv-settings/src/lib.rs
+++ b/crates/uv-settings/src/lib.rs
@@ -1,10 +1,10 @@
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 
-use tracing::debug;
+use tracing::{debug, warn};
 
 use uv_fs::Simplified;
-use uv_warnings::warn_user;
+use uv_warnings::owo_colors::OwoColorize;
 
 pub use crate::combine::*;
 pub use crate::settings::*;
@@ -74,7 +74,7 @@ impl FilesystemOptions {
                 }
                 Err(Error::PyprojectToml(file, err)) => {
                     // If we see an invalid `pyproject.toml`, warn but continue.
-                    warn_user!(
+                    warn!(
                         "Failed to parse `{}` during settings discovery:\n{}",
                         file.cyan(),
                         textwrap::indent(&err.to_string(), "  ")
@@ -107,7 +107,7 @@ impl FilesystemOptions {
                     .and_then(|content| toml::from_str::<PyProjectToml>(&content).ok())
                 {
                     if pyproject.tool.is_some_and(|tool| tool.uv.is_some()) {
-                        warn_user!(
+                        warn!(
                             "Found both a `uv.toml` file and a `[tool.uv]` section in an adjacent `pyproject.toml`. The `[tool.uv]` section will be ignored in favor of the `uv.toml` file."
                         );
                     }
diff --git a/crates/uv/tests/lock.rs b/crates/uv/tests/lock.rs
index 4efbd128e089..d4de1bd4df60 100644
--- a/crates/uv/tests/lock.rs
+++ b/crates/uv/tests/lock.rs
@@ -12653,13 +12653,6 @@ fn lock_duplicate_sources() -> Result<()> {
     ----- stdout -----
 
     ----- stderr -----
-    warning: Failed to parse `pyproject.toml` during settings discovery:
-      TOML parse error at line 9, column 9
-        |
-      9 |         python-multipart = { url = "https://files.pythonhosted.org/packages/c0/3e/9fbfd74e7f5b54f653f7ca99d44ceb56e718846920162165061c4c22b71a/python_multipart-0.0.8-py3-none-any.whl" }
-        |         ^
-      duplicate key `python-multipart` in table `tool.uv.sources`
-
     error: Failed to parse: `pyproject.toml`
       Caused by: TOML parse error at line 9, column 9
       |
diff --git a/crates/uv/tests/pip_compile.rs b/crates/uv/tests/pip_compile.rs
index ff82ad693c13..2fd6ad546e50 100644
--- a/crates/uv/tests/pip_compile.rs
+++ b/crates/uv/tests/pip_compile.rs
@@ -3285,15 +3285,6 @@ fn override_dependency_from_workspace_invalid_syntax() -> Result<()> {
     ----- stdout -----
 
     ----- stderr -----
-    warning: Failed to parse `pyproject.toml` during settings discovery:
-      TOML parse error at line 9, column 29
-        |
-      9 |     override-dependencies = [
-        |                             ^
-      no such comparison operator "=", must be one of ~= == != <= >= < > ===
-      werkzeug=2.3.0
-              ^^^^^^
-
     error: Failed to parse: `pyproject.toml`
       Caused by: TOML parse error at line 9, column 29
       |
diff --git a/crates/uv/tests/pip_install.rs b/crates/uv/tests/pip_install.rs
index 2987ec439954..5c7393f00299 100644
--- a/crates/uv/tests/pip_install.rs
+++ b/crates/uv/tests/pip_install.rs
@@ -92,13 +92,6 @@ fn invalid_pyproject_toml_syntax() -> Result<()> {
     ----- stdout -----
 
     ----- stderr -----
-    warning: Failed to parse `pyproject.toml` during settings discovery:
-      TOML parse error at line 1, column 5
-        |
-      1 | 123 - 456
-        |     ^
-      expected `.`, `=`
-
     error: Failed to parse: `pyproject.toml`
       Caused by: TOML parse error at line 1, column 5
       |
diff --git a/crates/uv/tests/show_settings.rs b/crates/uv/tests/show_settings.rs
index 374ef8a5abf1..099e9052998a 100644
--- a/crates/uv/tests/show_settings.rs
+++ b/crates/uv/tests/show_settings.rs
@@ -2892,7 +2892,6 @@ fn resolve_both() -> anyhow::Result<()> {
     }
 
     ----- stderr -----
-    warning: Found both a `uv.toml` file and a `[tool.uv]` section in an adjacent `pyproject.toml`. The `[tool.uv]` section will be ignored in favor of the `uv.toml` file.
     "###
     );
 
diff --git a/crates/uv/tests/venv.rs b/crates/uv/tests/venv.rs
index bed96f55ee1d..83698045eb31 100644
--- a/crates/uv/tests/venv.rs
+++ b/crates/uv/tests/venv.rs
@@ -494,13 +494,6 @@ fn create_venv_warns_user_on_requires_python_discovery_error() -> Result<()> {
     ----- stdout -----
 
     ----- stderr -----
-    warning: Failed to parse `pyproject.toml` during settings discovery:
-      TOML parse error at line 1, column 9
-        |
-      1 | invalid toml
-        |         ^
-      expected `.`, `=`
-
     warning: Failed to parse: `pyproject.toml`
     Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
     Creating virtualenv at: .venv