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:
@@ -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");
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user