From a90954163b9cc80009ec3aeacf9974817b3b1892 Mon Sep 17 00:00:00 2001
From: Guanqun Lu <guanqun.lu@gmail.com>
Date: Thu, 24 Oct 2019 23:46:05 +0800
Subject: reorder Llvm struct's fields based on the order in
 config.toml.example

---
 src/bootstrap/config.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 52b5cd888df..a97273ed2f8 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -243,14 +243,14 @@ struct Install {
 #[derive(Deserialize, Default)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 struct Llvm {
-    ccache: Option<StringOrBool>,
-    ninja: Option<bool>,
-    assertions: Option<bool>,
     optimize: Option<bool>,
     thin_lto: Option<bool>,
     release_debuginfo: Option<bool>,
+    assertions: Option<bool>,
+    ccache: Option<StringOrBool>,
     version_check: Option<bool>,
     static_libstdcpp: Option<bool>,
+    ninja: Option<bool>,
     targets: Option<String>,
     experimental_targets: Option<String>,
     link_jobs: Option<u32>,
-- 
cgit 1.4.1-3-g733a5


From 945223128a1c390dd457480543ee68d4c89478ee Mon Sep 17 00:00:00 2001
From: Guanqun Lu <guanqun.lu@gmail.com>
Date: Thu, 24 Oct 2019 23:50:03 +0800
Subject: reorder Build struct's fields based on the order in
 config.toml.example

---
 src/bootstrap/config.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index a97273ed2f8..d393990fdd2 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -200,16 +200,15 @@ struct Build {
     target: Vec<String>,
     cargo: Option<String>,
     rustc: Option<String>,
-    low_priority: Option<bool>,
-    compiler_docs: Option<bool>,
     docs: Option<bool>,
+    compiler_docs: Option<bool>,
     submodules: Option<bool>,
     fast_submodules: Option<bool>,
     gdb: Option<String>,
-    locked_deps: Option<bool>,
-    vendor: Option<bool>,
     nodejs: Option<String>,
     python: Option<String>,
+    locked_deps: Option<bool>,
+    vendor: Option<bool>,
     full_bootstrap: Option<bool>,
     extended: Option<bool>,
     tools: Option<HashSet<String>>,
@@ -217,6 +216,7 @@ struct Build {
     sanitizers: Option<bool>,
     profiler: Option<bool>,
     cargo_native_static: Option<bool>,
+    low_priority: Option<bool>,
     configure_args: Option<Vec<String>>,
     local_rebuild: Option<bool>,
     print_step_timings: Option<bool>,
-- 
cgit 1.4.1-3-g733a5


From e1e60c339a84e2263c6b728dc12596fb38035280 Mon Sep 17 00:00:00 2001
From: Guanqun Lu <guanqun.lu@gmail.com>
Date: Thu, 24 Oct 2019 23:51:02 +0800
Subject: reorder Install struct's fields based on the order in
 config.toml.example

---
 src/bootstrap/config.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index d393990fdd2..1a27ad94e04 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -228,11 +228,11 @@ struct Build {
 struct Install {
     prefix: Option<String>,
     sysconfdir: Option<String>,
-    datadir: Option<String>,
     docdir: Option<String>,
     bindir: Option<String>,
     libdir: Option<String>,
     mandir: Option<String>,
+    datadir: Option<String>,
 
     // standard paths, currently unused
     infodir: Option<String>,
-- 
cgit 1.4.1-3-g733a5


From 2c93fd2cb699a240dae93f2064000ce33d9f682d Mon Sep 17 00:00:00 2001
From: Guanqun Lu <guanqun.lu@gmail.com>
Date: Thu, 24 Oct 2019 23:53:45 +0800
Subject: reorder Rust struct's fields based on the order in
 config.toml.example

---
 src/bootstrap/config.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 1a27ad94e04..d49c8080ebc 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -293,6 +293,7 @@ impl Default for StringOrBool {
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 struct Rust {
     optimize: Option<bool>,
+    debug: Option<bool>,
     codegen_units: Option<u32>,
     codegen_units_std: Option<u32>,
     debug_assertions: Option<bool>,
@@ -301,25 +302,24 @@ struct Rust {
     debuginfo_level_std: Option<u32>,
     debuginfo_level_tools: Option<u32>,
     debuginfo_level_tests: Option<u32>,
-    parallel_compiler: Option<bool>,
     backtrace: Option<bool>,
+    incremental: Option<bool>,
+    parallel_compiler: Option<bool>,
     default_linker: Option<String>,
     channel: Option<String>,
     musl_root: Option<String>,
     rpath: Option<bool>,
+    verbose_tests: Option<bool>,
     optimize_tests: Option<bool>,
     codegen_tests: Option<bool>,
     ignore_git: Option<bool>,
-    debug: Option<bool>,
     dist_src: Option<bool>,
-    verbose_tests: Option<bool>,
-    incremental: Option<bool>,
     save_toolstates: Option<String>,
     codegen_backends: Option<Vec<String>>,
     codegen_backends_dir: Option<String>,
     lld: Option<bool>,
-    lldb: Option<bool>,
     llvm_tools: Option<bool>,
+    lldb: Option<bool>,
     deny_warnings: Option<bool>,
     backtrace_on_ice: Option<bool>,
     verify_llvm_ir: Option<bool>,
-- 
cgit 1.4.1-3-g733a5


From 5defe06f96f62807af0ac09d1896d1baba5d8054 Mon Sep 17 00:00:00 2001
From: Guanqun Lu <guanqun.lu@gmail.com>
Date: Thu, 24 Oct 2019 23:54:31 +0800
Subject: reorder TomlTarget struct's fields based on the order in
 config.toml.example

---
 src/bootstrap/config.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index d49c8080ebc..ef6253903e9 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -333,13 +333,13 @@ struct Rust {
 #[derive(Deserialize, Default)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 struct TomlTarget {
-    llvm_config: Option<String>,
-    llvm_filecheck: Option<String>,
     cc: Option<String>,
     cxx: Option<String>,
     ar: Option<String>,
     ranlib: Option<String>,
     linker: Option<String>,
+    llvm_config: Option<String>,
+    llvm_filecheck: Option<String>,
     android_ndk: Option<String>,
     crt_static: Option<bool>,
     musl_root: Option<String>,
-- 
cgit 1.4.1-3-g733a5