move stage0 config closer to Config

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index cb89a98f75c3b924e9b8439ea42b1a2398da6f3d..819831a2283e4c8dfe17a001f043082eeca8b22a 100644 (file)
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -212,6 +212,28 @@ pub struct Config {
     pub out: PathBuf,
 }
 
+#[derive(Default, Deserialize)]
+#[cfg_attr(test, derive(Clone))]
+pub struct Stage0Metadata {
+    pub config: Stage0Config,
+    pub checksums_sha256: HashMap<String, String>,
+    pub rustfmt: Option<RustfmtMetadata>,
+}
+#[derive(Default, Deserialize)]
+#[cfg_attr(test, derive(Clone))]
+pub struct Stage0Config {
+    pub dist_server: String,
+    pub artifacts_server: String,
+    pub artifacts_with_llvm_assertions_server: String,
+    pub git_merge_commit_email: String,
+}
+#[derive(Default, Deserialize)]
+#[cfg_attr(test, derive(Clone))]
+pub struct RustfmtMetadata {
+    pub date: String,
+    pub version: String,
+}
+
 #[derive(Clone, Debug)]
 pub enum RustfmtState {
     SystemToolchain(PathBuf),
@@ -720,28 +742,6 @@ struct TomlTarget {
     }
 }
 
-#[derive(Default, Deserialize)]
-#[cfg_attr(test, derive(Clone))]
-pub struct Stage0Metadata {
-    pub config: Stage0Config,
-    pub checksums_sha256: HashMap<String, String>,
-    pub rustfmt: Option<RustfmtMetadata>,
-}
-#[derive(Default, Deserialize)]
-#[cfg_attr(test, derive(Clone))]
-pub struct Stage0Config {
-    pub dist_server: String,
-    pub artifacts_server: String,
-    pub artifacts_with_llvm_assertions_server: String,
-    pub git_merge_commit_email: String,
-}
-#[derive(Default, Deserialize)]
-#[cfg_attr(test, derive(Clone))]
-pub struct RustfmtMetadata {
-    pub date: String,
-    pub version: String,
-}
-
 impl Config {
     pub fn default_opts() -> Config {
         let mut config = Config::default();