refactor(dist): extract "nightly tips" out of the match block in components_missing_msg()

Author: rami3l

src/dist/mod.rs

@@ -45,7 +45,7 @@ pub static DEFAULT_DIST_SERVER: &str = "https://static.rust-lang.org";
 pub(crate) static DEFAULT_DIST_ROOT: &str = "https://static.rust-lang.org/dist";
 
 const TOOLSTATE_MSG: &str =
-    "If you require these components, please install and use the latest successful build version,\n\
+    "If you require the component(s), please install and use the latest successful build version,\n\
      which you can find at <https://rust-lang.github.io/rustup-components-history>.\n\nAfter determining \
      the correct date, install it with a command such as:\n\n    \
      rustup toolchain install nightly-2018-12-27\n\n\
@@ -73,15 +73,6 @@ fn components_missing_msg(cs: &[Component], manifest: &ManifestV2, toolchain: &s
                 c.description(manifest),
                 toolchain,
             );
-
-            if toolchain.starts_with("nightly") {
-                let _ = write!(buf, "{nightly_tips}");
-            }
-
-            let _ = write!(
-                buf,
-                "If you don't need the component, you could try a minimal installation with:\n\n{suggestion}\n\n{TOOLSTATE_MSG}"
-            );
         }
         cs => {
             let cs_str = cs
@@ -93,18 +84,17 @@ fn components_missing_msg(cs: &[Component], manifest: &ManifestV2, toolchain: &s
                 buf,
                 "some components are unavailable for download for channel '{toolchain}': {cs_str}"
             );
-
-            if toolchain.starts_with("nightly") {
-                let _ = write!(buf, "{nightly_tips}");
-            }
-
-            let _ = write!(
-                buf,
-                "If you don't need the components, you could try a minimal installation with:\n\n{suggestion}\n\n{TOOLSTATE_MSG}"
-            );
         }
     }
 
+    if toolchain.starts_with("nightly") {
+        let _ = write!(buf, "{nightly_tips}");
+
+        let _ = write!(
+            buf,
+            "If you don't need the component(s), you could try a minimal installation with:\n\n{suggestion}\n\n{TOOLSTATE_MSG}"
+        );
+    } 
     String::from_utf8(buf).unwrap()
 }