Merge pull request #723 from petosorus/master

Fix logs for uniformity (#716)
rustwasm · Dec 22, 2020 · d46d1c6 · d46d1c6
2 parents 21d8302 + c2d5d5a
commit d46d1c6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/progressbar.rs b/src/progressbar.rs
@@ -82,9 +82,9 @@ impl ProgressOutput {
     pub fn warn(&self, message: &str) {
         if !self.quiet() && self.is_log_enabled(LogLevel::Warn) {
             let warn = format!(
-                "{} {}: {}",
-                emoji::WARN,
+                "{}: {} {}",
                 style("[WARN]").bold().dim(),
+                emoji::WARN,
                 message
             );
             self.message(&warn);
@@ -95,9 +95,9 @@ impl ProgressOutput {
     pub fn error(&self, message: &str) {
         if self.is_log_enabled(LogLevel::Error) {
             let err = format!(
-                "{} {}: {}",
-                emoji::ERROR,
+                "{}: {} {}",
                 style("[ERR]").bold().dim(),
+                emoji::ERROR,
                 message
             );
             self.message(&err);

diff --git a/tests/all/log_level.rs b/tests/all/log_level.rs
@@ -16,7 +16,7 @@ fn matches_info() -> impl Predicate<str> + PredicateReflection {
 }
 
 fn matches_warn() -> impl Predicate<str> + PredicateReflection {
-    contains(":-) [WARN]: origin crate has no README")
+    contains("[WARN]: :-) origin crate has no README")
 }
 
 fn matches_cargo() -> impl Predicate<str> + PredicateReflection {

diff --git a/tests/all/manifest.rs b/tests/all/manifest.rs
@@ -512,9 +512,9 @@ fn parse_crate_data_returns_unused_keys_in_cargo_toml() {
         .assert()
         .success()
         .stderr(predicates::str::contains(
-            "[WARN]: \"package.metadata.wasm-pack.profile.production\" is an unknown key and will \
-             be ignored. Please check your Cargo.toml.",
-        ));
+        "[WARN]: :-) \"package.metadata.wasm-pack.profile.production\" is an unknown key and will \
+         be ignored. Please check your Cargo.toml.",
+    ));
 }
 
 #[test]