Let ^$ match lines by default

resolves #60
chmln · Jan 25, 2020 · 87491b4 · 87491b4
1 parent 4d27421
commit 87491b4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,8 +12,8 @@ repository = "https://github.com/chmln/sd.git"
 categories = ["command-line-utilities", "text-processing", "development-tools"]
 
 [dependencies]
-regex = "1.3.1"
-structopt = "0.3.7"
+regex = "1.3.3"
+structopt = "0.3.8"
 rayon = "1.3.0"
 unescape = "0.1.0"
 memmap = "0.7.0"
@@ -24,7 +24,7 @@ thiserror = "1.0.9"
 assert_cmd = "0.12.0"
 
 [build-dependencies]
-structopt = "0.3.7"
+structopt = "0.3.8"
 man = "0.3.0"
 
 [profile.release]

diff --git a/src/error.rs b/src/error.rs
@@ -2,7 +2,7 @@
 pub enum Error {
     #[error("invalid regex {0}")]
     Regex(#[from] regex::Error),
-    #[error("{0}")]
+    #[error(transparent)]
     File(#[from] std::io::Error),
     #[error("failed to move file: {0}")]
     TempfilePersist(#[from] tempfile::PersistError),

diff --git a/src/input.rs b/src/input.rs
@@ -42,14 +42,16 @@ impl Replacer {
         };
 
         let mut regex = regex::bytes::RegexBuilder::new(&look_for);
+        regex.multi_line(true);
 
         if let Some(flags) = flags {
             flags.chars().for_each(|c| {
                 #[rustfmt::skip]
                 match c {
                     'c' => { regex.case_insensitive(false); },
                     'i' => { regex.case_insensitive(true); },
-                    'm' => { regex.multi_line(true); },
+                    'm' => {},
+                    'e' => { regex.multi_line(false); },
                     's' => { regex.dot_matches_new_line(true); },
                     'w' => {
                         regex = regex::bytes::RegexBuilder::new(&format!(