Avoid multi-sentence error messagess (casey#3315)

Author: casey

src/compile_error.rs

@@ -203,8 +203,8 @@ impl Display for CompileError<'_> {
       ),
       InconsistentLeadingWhitespace { expected, found } => write!(
         f,
-        "recipe line has inconsistent leading whitespace. Recipe started with `{}` but found \
-           line with `{}`",
+        "recipe line has inconsistent leading whitespace, started with `{}` but found line with \
+          `{}`",
         ShowWhitespace(expected),
         ShowWhitespace(found)
       ),
@@ -239,14 +239,14 @@ impl Display for CompileError<'_> {
         close,
       } => write!(
         f,
-        "mismatched closing delimiter `{}`. (Did you mean to close the `{}` on line {}?)",
+        "mismatched closing delimiter `{}`, did you mean to close the `{}` on line {}?",
         close.close(),
         open.open(),
         open_line.ordinal(),
       ),
       MixedLeadingWhitespace { whitespace } => write!(
         f,
-        "found a mix of tabs and spaces in leading whitespace: `{}`\nLeading whitespace may \
+        "found a mix of tabs and spaces in leading whitespace: `{}`\nleading whitespace may \
            consist of tabs or spaces, but not both",
         ShowWhitespace(whitespace)
       ),

src/error.rs

@@ -632,7 +632,7 @@ impl ColorDisplay for Error<'_> {
       Internal { message } => {
         write!(
           f,
-          "internal runtime error, this may indicate a bug in just: {message} \
+          "internal runtime error, this may indicate a bug in just: {message}\n\
           consider filing an issue: https://github.com/casey/just/issues/new",
         )?;
       }
@@ -846,7 +846,7 @@ impl ColorDisplay for Error<'_> {
       UnstableFeature { unstable_feature } => {
         write!(
           f,
-          "{unstable_feature} Invoke `just` with `--unstable`, set the `JUST_UNSTABLE` environment variable, or add `set unstable` to your `justfile` to enable unstable features.",
+          "{unstable_feature}, invoke `just` with `--unstable`, set the `JUST_UNSTABLE` environment variable, or add `set unstable` to your `justfile` to enable unstable features",
         )?;
       }
       WriteJustfile { justfile, io_error } => {

src/unstable_feature.rs

@@ -12,12 +12,12 @@ impl Display for UnstableFeature {
     match self {
       Self::LogicalOperators => write!(
         f,
-        "the logical operators `&&` and `||` are currently unstable."
+        "the logical operators `&&` and `||` are currently unstable"
       ),
       Self::UserDefinedFunction => {
-        write!(f, "user-defined functions are currently unstable.")
+        write!(f, "user-defined functions are currently unstable")
       }
-      Self::WhichFunction => write!(f, "the `which()` function is currently unstable."),
+      Self::WhichFunction => write!(f, "the `which()` function is currently unstable"),
     }
   }
 }

tests/delimiters.rs

@@ -6,7 +6,7 @@ fn mismatched_delimiter() {
     .justfile("(]")
     .stderr(
       "
-        error: mismatched closing delimiter `]`. (Did you mean to close the `(` on line 1?)
+        error: mismatched closing delimiter `]`, did you mean to close the `(` on line 1?
          ——▶ justfile:1:2
           │
         1 │ (]

tests/function_definitions.rs

@@ -4,7 +4,7 @@ use super::*;
 fn unstable() {
   Test::new()
     .justfile("foo() := 'bar'")
-    .stderr_regex(r"error: user-defined functions are currently unstable\..*")
+    .stderr_regex(r"error: user-defined functions are currently unstable,.*")
     .failure();
 }
 

tests/logical_operators.rs

@@ -15,13 +15,13 @@ fn logical_operators_are_unstable() {
   Test::new()
     .justfile("x := 'foo' && 'bar'")
     .args(["--evaluate", "x"])
-    .stderr_regex(r"error: the logical operators `&&` and `\|\|` are currently unstable. .*")
+    .stderr_regex(r"error: the logical operators `&&` and `\|\|` are currently unstable, .*")
     .failure();
 
   Test::new()
     .justfile("x := 'foo' || 'bar'")
     .args(["--evaluate", "x"])
-    .stderr_regex(r"error: the logical operators `&&` and `\|\|` are currently unstable. .*")
+    .stderr_regex(r"error: the logical operators `&&` and `\|\|` are currently unstable, .*")
     .failure();
 }
 

tests/misc.rs

@@ -833,7 +833,7 @@ fn mixed_whitespace() {
     .justfile("bar:\n\t echo hello")
     .stderr(
       "error: found a mix of tabs and spaces in leading whitespace: `␉␠`
-Leading whitespace may consist of tabs or spaces, but not both
+leading whitespace may consist of tabs or spaces, but not both
  ——▶ justfile:2:1
   │
 2 │      echo hello
@@ -863,8 +863,8 @@ fn inconsistent_leading_whitespace() {
   Test::new()
     .justfile("bar:\n\t\techo hello\n\t echo goodbye")
     .stderr(
-      "error: recipe line has inconsistent leading whitespace. \
-            Recipe started with `␉␉` but found line with `␉␠`
+      "error: recipe line has inconsistent leading whitespace, \
+            started with `␉␉` but found line with `␉␠`
  ——▶ justfile:3:1
   │
 3 │      echo goodbye

tests/unstable.rs

@@ -19,7 +19,7 @@ fn set_unstable_false_with_env_var() {
       .justfile("f(a) := a")
       .arg("--dump")
       .env("JUST_UNSTABLE", val)
-      .stderr_regex("error: user-defined functions are currently unstable.*")
+      .stderr_regex("error: user-defined functions are currently unstable,.*")
       .failure();
   }
 }
@@ -29,7 +29,7 @@ fn set_unstable_false_with_env_var_unset() {
   Test::new()
     .justfile("f(a) := a")
     .arg("--dump")
-    .stderr_regex("error: user-defined functions are currently unstable.*")
+    .stderr_regex("error: user-defined functions are currently unstable,.*")
     .failure();
 }
 

tests/which_function.rs

@@ -230,7 +230,7 @@ fn is_unstable() {
     .write("hello.exe", HELLO_SCRIPT)
     .make_executable("hello.exe")
     .env("PATH", path.to_str().unwrap())
-    .stderr_regex(r".*the `which\(\)` function is currently unstable\..*")
+    .stderr_regex(r".*the `which\(\)` function is currently unstable,.*")
     .failure();
 }