Skip to content

Commit ad98550

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

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
@@ -759,22 +759,22 @@ impl Config {
759759
config.verbose_tests = config.is_verbose();
760760

761761
let Install {
762-
prefix: install_prefix,
763-
sysconfdir: install_sysconfdir,
764-
docdir: install_docdir,
765-
bindir: install_bindir,
766-
libdir: install_libdir,
767-
mandir: install_mandir,
768-
datadir: install_datadir,
762+
prefix: install_prefix_toml,
763+
sysconfdir: install_sysconfdir_toml,
764+
docdir: install_docdir_toml,
765+
bindir: install_bindir_toml,
766+
libdir: install_libdir_toml,
767+
mandir: install_mandir_toml,
768+
datadir: install_datadir_toml,
769769
} = toml.install.unwrap_or_default();
770770

771-
let install_prefix = install_prefix.map(PathBuf::from);
772-
let install_sysconfdir = install_sysconfdir.map(PathBuf::from);
773-
let install_docdir = install_docdir.map(PathBuf::from);
774-
let install_bindir = install_bindir.map(PathBuf::from);
775-
let install_libdir = install_libdir.map(PathBuf::from);
776-
let install_mandir = install_mandir.map(PathBuf::from);
777-
let install_datadir = install_datadir.map(PathBuf::from);
771+
let install_prefix = install_prefix_toml.map(PathBuf::from);
772+
let install_sysconfdir = install_sysconfdir_toml.map(PathBuf::from);
773+
let install_docdir = install_docdir_toml.map(PathBuf::from);
774+
let install_bindir = install_bindir_toml.map(PathBuf::from);
775+
let install_libdir = install_libdir_toml.map(PathBuf::from);
776+
let install_mandir = install_mandir_toml.map(PathBuf::from);
777+
let install_datadir = install_datadir_toml.map(PathBuf::from);
778778
config.prefix = install_prefix;
779779
config.sysconfdir = install_sysconfdir;
780780
config.datadir = install_datadir;

0 commit comments

Comments
 (0)