about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbit-aloo <sshourya17@gmail.com>2025-08-01 17:51:38 +0530
committerbit-aloo <sshourya17@gmail.com>2025-08-01 20:27:49 +0530
commitad98550f708d1b18e7c2ea800d67e9662eee6995 (patch)
tree2d7aa31248b9c4a8fb12346b879363534afba3a0
parent4d2a2c22b566429aee5a19cc04f182a43bf35f72 (diff)
downloadrust-ad98550f708d1b18e7c2ea800d67e9662eee6995.tar.gz
rust-ad98550f708d1b18e7c2ea800d67e9662eee6995.zip
make install toml fields follow a specific naming convention
-rw-r--r--src/bootstrap/src/core/config/config.rs28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 7e8e66b3698..8736f271cda 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -759,22 +759,22 @@ impl Config {
         config.verbose_tests = config.is_verbose();
 
         let Install {
-            prefix: install_prefix,
-            sysconfdir: install_sysconfdir,
-            docdir: install_docdir,
-            bindir: install_bindir,
-            libdir: install_libdir,
-            mandir: install_mandir,
-            datadir: install_datadir,
+            prefix: install_prefix_toml,
+            sysconfdir: install_sysconfdir_toml,
+            docdir: install_docdir_toml,
+            bindir: install_bindir_toml,
+            libdir: install_libdir_toml,
+            mandir: install_mandir_toml,
+            datadir: install_datadir_toml,
         } = toml.install.unwrap_or_default();
 
-        let install_prefix = install_prefix.map(PathBuf::from);
-        let install_sysconfdir = install_sysconfdir.map(PathBuf::from);
-        let install_docdir = install_docdir.map(PathBuf::from);
-        let install_bindir = install_bindir.map(PathBuf::from);
-        let install_libdir = install_libdir.map(PathBuf::from);
-        let install_mandir = install_mandir.map(PathBuf::from);
-        let install_datadir = install_datadir.map(PathBuf::from);
+        let install_prefix = install_prefix_toml.map(PathBuf::from);
+        let install_sysconfdir = install_sysconfdir_toml.map(PathBuf::from);
+        let install_docdir = install_docdir_toml.map(PathBuf::from);
+        let install_bindir = install_bindir_toml.map(PathBuf::from);
+        let install_libdir = install_libdir_toml.map(PathBuf::from);
+        let install_mandir = install_mandir_toml.map(PathBuf::from);
+        let install_datadir = install_datadir_toml.map(PathBuf::from);
         config.prefix = install_prefix;
         config.sysconfdir = install_sysconfdir;
         config.datadir = install_datadir;