Skip to content

Commit 4d2a2c2

Browse files
committed
make dist toml fields follow a specific naming convention
1 parent c008a4b commit 4d2a2c2

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,22 +1272,22 @@ impl Config {
12721272
}
12731273

12741274
let Dist {
1275-
sign_folder: dist_sign_folder,
1276-
upload_addr: dist_upload_addr,
1277-
src_tarball: dist_src_tarball,
1278-
compression_formats: dist_compression_formats,
1279-
compression_profile: dist_compression_profile,
1280-
include_mingw_linker: dist_include_mingw_linker,
1281-
vendor: dist_vendor,
1275+
sign_folder: dist_sign_folder_toml,
1276+
upload_addr: dist_upload_addr_toml,
1277+
src_tarball: dist_src_tarball_toml,
1278+
compression_formats: dist_compression_formats_toml,
1279+
compression_profile: dist_compression_profile_toml,
1280+
include_mingw_linker: dist_include_mingw_linker_toml,
1281+
vendor: dist_vendor_toml,
12821282
} = toml.dist.unwrap_or_default();
12831283

1284-
config.dist_sign_folder = dist_sign_folder.map(PathBuf::from);
1285-
config.dist_upload_addr = dist_upload_addr;
1286-
config.dist_compression_formats = dist_compression_formats;
1287-
set(&mut config.dist_compression_profile, dist_compression_profile);
1288-
set(&mut config.rust_dist_src, dist_src_tarball);
1289-
set(&mut config.dist_include_mingw_linker, dist_include_mingw_linker);
1290-
config.dist_vendor = dist_vendor.unwrap_or_else(|| {
1284+
config.dist_sign_folder = dist_sign_folder_toml.map(PathBuf::from);
1285+
config.dist_upload_addr = dist_upload_addr_toml;
1286+
config.dist_compression_formats = dist_compression_formats_toml;
1287+
set(&mut config.dist_compression_profile, dist_compression_profile_toml);
1288+
set(&mut config.rust_dist_src, dist_src_tarball_toml);
1289+
set(&mut config.dist_include_mingw_linker, dist_include_mingw_linker_toml);
1290+
config.dist_vendor = dist_vendor_toml.unwrap_or_else(|| {
12911291
// If we're building from git or tarball sources, enable it by default.
12921292
config.rust_info.is_managed_git_subrepository() || config.rust_info.is_from_tarball()
12931293
});

0 commit comments

Comments
 (0)