From 0487034e91bbbbbe88def7ebdaf58abf454f8cb8 Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Sun, 20 Jul 2025 20:28:31 -0400
Subject: [PATCH] Fix bad merge in `warn_uv_toml_masked_fields` (#14767)

## Summary

The branch got stale and merged without flagging that this no longer
compiles.
---
 crates/uv-settings/src/lib.rs       | 4 ++++
 crates/uv/tests/it/show_settings.rs | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/crates/uv-settings/src/lib.rs b/crates/uv-settings/src/lib.rs
index 4dd4c392f..64f160aa3 100644
--- a/crates/uv-settings/src/lib.rs
+++ b/crates/uv-settings/src/lib.rs
@@ -302,6 +302,7 @@ fn warn_uv_toml_masked_fields(options: &Options) {
                 fork_strategy,
                 dependency_metadata,
                 config_settings,
+                config_settings_package,
                 no_build_isolation,
                 no_build_isolation_package,
                 exclude_newer,
@@ -422,6 +423,9 @@ fn warn_uv_toml_masked_fields(options: &Options) {
     if config_settings.is_some() {
         masked_fields.push("config-settings");
     }
+    if config_settings_package.is_some() {
+        masked_fields.push("config-settings-package");
+    }
     if no_build_isolation.is_some() {
         masked_fields.push("no-build-isolation");
     }
diff --git a/crates/uv/tests/it/show_settings.rs b/crates/uv/tests/it/show_settings.rs
index c88f8b739..293b437d6 100644
--- a/crates/uv/tests/it/show_settings.rs
+++ b/crates/uv/tests/it/show_settings.rs
@@ -3870,6 +3870,7 @@ fn resolve_both_special_fields() -> anyhow::Result<()> {
                         publish_url: None,
                         authenticate: Auto,
                         ignore_error_codes: None,
+                        cache_control: None,
                     },
                 ],
                 flat_index: [],
@@ -3933,6 +3934,9 @@ fn resolve_both_special_fields() -> anyhow::Result<()> {
             config_setting: ConfigSettings(
                 {},
             ),
+            config_settings_package: PackageConfigSettings(
+                {},
+            ),
             python_version: None,
             python_platform: None,
             universal: false,