Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge in `warn_uv_toml_masked_fields` (#14767) 

## Summary

The branch got stale and merged without flagging that this no longer
compiles.
This commit is contained in:
Charlie Marsh 2025-07-20 20:28:31 -04:00 committed by GitHub
parent a42a2846e6
commit 0487034e91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/uv-settings/src/lib.rs
View File

@ -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");
}

4
crates/uv/tests/it/show_settings.rs
View File

@ -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,