Skip to content

Commit 222dfcc

Browse files
committed
add install default implementation
1 parent 58a38cd commit 222dfcc

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
lines changed

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

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -757,16 +757,31 @@ impl Config {
757757
// Verbose flag is a good default for `rust.verbose-tests`.
758758
config.verbose_tests = config.is_verbose();
759759

760-
if let Some(install) = toml.install {
761-
let Install { prefix, sysconfdir, docdir, bindir, libdir, mandir, datadir } = install;
762-
config.prefix = prefix.map(PathBuf::from);
763-
config.sysconfdir = sysconfdir.map(PathBuf::from);
764-
config.datadir = datadir.map(PathBuf::from);
765-
config.docdir = docdir.map(PathBuf::from);
766-
set(&mut config.bindir, bindir.map(PathBuf::from));
767-
config.libdir = libdir.map(PathBuf::from);
768-
config.mandir = mandir.map(PathBuf::from);
769-
}
760+
let Install {
761+
prefix: install_prefix,
762+
sysconfdir: install_sysconfdir,
763+
docdir: install_docdir,
764+
bindir: install_bindir,
765+
libdir: install_libdir,
766+
mandir: install_mandir,
767+
datadir: install_datadir,
768+
} = toml.install.unwrap_or_default();
769+
770+
let install_prefix = install_prefix.map(PathBuf::from);
771+
let install_sysconfdir = install_sysconfdir.map(PathBuf::from);
772+
let install_docdir = install_docdir.map(PathBuf::from);
773+
let install_bindir = install_bindir.map(PathBuf::from);
774+
let install_libdir = install_libdir.map(PathBuf::from);
775+
let install_mandir = install_mandir.map(PathBuf::from);
776+
let install_datadir = install_datadir.map(PathBuf::from);
777+
778+
config.prefix = install_prefix;
779+
config.sysconfdir = install_sysconfdir;
780+
config.datadir = install_datadir;
781+
config.docdir = install_docdir;
782+
set(&mut config.bindir, install_bindir);
783+
config.libdir = install_libdir;
784+
config.mandir = install_mandir;
770785

771786
let file_content = t!(fs::read_to_string(config.src.join("src/ci/channel")));
772787
let ci_channel = file_content.trim_end();

src/bootstrap/src/core/config/toml/install.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use crate::{HashSet, PathBuf, define_config, exit};
1414

1515
define_config! {
1616
/// TOML representation of various global install decisions.
17+
#[derive(Default)]
1718
struct Install {
1819
prefix: Option<String> = "prefix",
1920
sysconfdir: Option<String> = "sysconfdir",

0 commit comments

Comments
 (0)