Merge pull request #2491 from camelid/improve-unpack-ram-message

Improve 'defaulting to ... unpack ram' message

Author: kinnison

src/dist/notifications.rs

@@ -194,7 +194,7 @@ impl<'a> Display for Notification<'a> {
                 write!(f, "Force-skipping unavailable component '{}'", component)
             }
             SignatureInvalid(url) => write!(f, "Signature verification failed for '{}'", url),
-            RetryingDownload(url) => write!(f, "Retrying download for '{}'", url),
+            RetryingDownload(url) => write!(f, "retrying download for '{}'", url),
         }
     }
 }

src/utils/notifications.rs

@@ -87,7 +87,7 @@ impl<'a> Display for Notification<'a> {
             ),
             SetDefaultBufferSize(size) => write!(
                 f,
-                "defaulting to {} unpack ram",
+                "using up to {} of RAM to unpack components",
                 units::Size::new(*size, units::Unit::B, units::UnitMode::Norm)
             ),
             DownloadingFile(url, _) => write!(f, "downloading file from: '{}'", url),

tests/cli-exact.rs

@@ -34,7 +34,7 @@ info: downloading component 'rust-docs'
 info: downloading component 'rust-std'
 info: downloading component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'
@@ -169,7 +169,7 @@ info: downloading component 'rust-docs'
 info: downloading component 'rust-std'
 info: downloading component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'
@@ -502,7 +502,7 @@ fn cross_install_indicates_target() {
             &format!(
                 r"info: downloading component 'rust-std' for '{0}'
 info: installing component 'rust-std' for '{0}'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 ",
                 clitools::CROSS_ARCH1
             ),

tests/cli-rustup.rs

@@ -54,7 +54,7 @@ info: removing previous version of component 'rust-docs'
 info: removing previous version of component 'rust-std'
 info: removing previous version of component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'
@@ -95,7 +95,7 @@ info: removing previous version of component 'rust-docs'
 info: removing previous version of component 'rust-std'
 info: removing previous version of component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'
@@ -160,7 +160,7 @@ info: removing previous version of component 'rust-docs'
 info: removing previous version of component 'rust-std'
 info: removing previous version of component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'
@@ -231,7 +231,7 @@ info: removing previous version of component 'rust-docs'
 info: removing previous version of component 'rust-std'
 info: removing previous version of component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'
@@ -293,7 +293,7 @@ info: downloading component 'rust-docs'
 info: downloading component 'rust-std'
 info: downloading component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'

tests/cli-self-upd.rs

@@ -112,7 +112,7 @@ info: downloading component 'rust-docs'
 info: downloading component 'rust-std'
 info: downloading component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rust-std'
 info: installing component 'rustc'

tests/cli-v2.rs

@@ -1409,7 +1409,7 @@ info: downloading component 'cargo'
 info: downloading component 'rust-docs'
 info: downloading component 'rustc'
 info: installing component 'cargo'
-info: defaulting to 500.0 MiB unpack ram
+info: using up to 500.0 MiB of RAM to unpack components
 info: installing component 'rust-docs'
 info: installing component 'rustc'
 "