better awareness of line breaks

src/cmd/fix.rs

@@ -49,6 +49,7 @@ impl Cmd {
             bar.finish_and_clear();
             return Ok(());
         };
+
         if log_enabled!(log::Level::Debug) {
             let elapsed = SystemTime::now().duration_since(time).unwrap();
             log::debug!("command output in {} milliseconds", elapsed.as_millis());

src/rules/cargo_install_cwd.rs

@@ -1,4 +1,4 @@
-const ERROR: &str = "using `cargo install` to install the binaries from the package in current working directory is no longer supported";
+const ERROR: &str = "using `cargo install` to install the binaries";
 
 pub fn cargo_install_cwd(cmd: &[String], error: &str) -> Option<Vec<String>> {
     if !error.contains(ERROR) {

src/rules/git_no_upstream.rs

@@ -1,13 +1,16 @@
-pub fn git_no_upstream(_cmd: &[String], error: &str) -> Option<Vec<String>> {
-    let regex = regex::Regex::new(
-        r"to push the current branch and set the remote as upstream, use\s+([^\n]+)",
-    )
-    .unwrap();
-    let cmd = regex
+pub fn git_no_upstream(cmd: &[String], error: &str) -> Option<Vec<String>> {
+    let regex =
+        regex::Regex::new(r"--set-upstream\s([A-Za-z0-9-_./]+)\s([A-Za-z0-9-_./]+)").unwrap();
+    let origin = regex
         .captures_iter(error)
-        .map(|c| c.extract::<1>().1[0])
+        .map(|c| c.extract::<2>())
         .next()?;
-    shlex::split(cmd)
+    let (idx, _) = cmd.iter().enumerate().find(|(_, s)| *s == "push")?;
+    let mut cmd = cmd.to_vec();
+    cmd.insert(idx + 1, "--set-upstream".to_string());
+    cmd.insert(idx + 2, origin.1[0].to_string());
+    cmd.insert(idx + 3, origin.1[1].to_string());
+    Some(cmd)
 }
 
 #[cfg(test)]