From 80bfec17eb843c311e8dfca76862a45e6a716fc8 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 30 May 2022 11:51:07 -0400
Subject: [PATCH 1/4] find/matchers: Implement -mount as an alias for -xdev

---
 src/find/matchers/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/find/matchers/mod.rs b/src/find/matchers/mod.rs
index 4cdb6e6..49d9813 100644
--- a/src/find/matchers/mod.rs
+++ b/src/find/matchers/mod.rs
@@ -463,7 +463,7 @@ fn build_matcher_tree(
                 config.depth_first = true;
                 None
             }
-            "-xdev" => {
+            "-mount" | "-xdev" => {
                 // TODO add warning if it appears after actual testing criterion
                 config.same_file_system = true;
                 None

From 7855d083796926c9eb699fe82f1782d87c441b15 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 30 May 2022 11:53:39 -0400
Subject: [PATCH 2/4] find/matchers: Add the `ed` and `sed` regex types

---
 src/find/matchers/regex.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/find/matchers/regex.rs b/src/find/matchers/regex.rs
index b29e3e5..240d849 100644
--- a/src/find/matchers/regex.rs
+++ b/src/find/matchers/regex.rs
@@ -67,6 +67,8 @@ impl FromStr for RegexType {
             "grep" => Ok(Self::Grep),
             "posix-basic" => Ok(Self::PosixBasic),
             "posix-extended" => Ok(Self::PosixExtended),
+            // ed and sed are the same as posix-basic
+            "ed" | "sed" => Ok(Self::PosixBasic),
             _ => Err(ParseRegexTypeError(s.to_owned())),
         }
     }

From 1bfbe7623e5f66beb36d980b1fa62b086cc5f9ca Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 31 May 2022 17:01:35 -0400
Subject: [PATCH 3/4] tests: Add a simple integration test for find
 -mount/-xdev

---
 tests/find_cmd_tests.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/find_cmd_tests.rs b/tests/find_cmd_tests.rs
index 45e68a1..619c138 100644
--- a/tests/find_cmd_tests.rs
+++ b/tests/find_cmd_tests.rs
@@ -378,3 +378,26 @@ fn find_perm() {
         .assert()
         .success();
 }
+
+#[serial(working_dir)]
+#[test]
+fn find_mount_xdev() {
+    // Make sure that -mount/-xdev doesn't prune unexpectedly.
+    // TODO: Test with a mount point in the search.
+
+    Command::cargo_bin("find")
+        .expect("found binary")
+        .args(&["test_data", "-mount"])
+        .assert()
+        .success()
+        .stderr(predicate::str::is_empty())
+        .stdout(predicate::str::contains("abbbc"));
+
+    Command::cargo_bin("find")
+        .expect("found binary")
+        .args(&["test_data", "-xdev"])
+        .assert()
+        .success()
+        .stderr(predicate::str::is_empty())
+        .stdout(predicate::str::contains("abbbc"));
+}

From 972ac0bbff2fbf5e72c8163a65ddf66afa5e6e0d Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 31 May 2022 17:02:59 -0400
Subject: [PATCH 4/4] tests: Add integration tests for find -regextype ed/sed

---
 tests/find_cmd_tests.rs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/find_cmd_tests.rs b/tests/find_cmd_tests.rs
index 45e68a1..50a352c 100644
--- a/tests/find_cmd_tests.rs
+++ b/tests/find_cmd_tests.rs
@@ -190,6 +190,34 @@ fn regex_types() {
         .success()
         .stderr(predicate::str::is_empty())
         .stdout(predicate::str::contains("teeest"));
+
+    Command::cargo_bin("find")
+        .expect("found binary")
+        .args(&[
+            &temp_dir_path,
+            "-regextype",
+            "ed",
+            "-regex",
+            &fix_up_regex_slashes(r".*/te\{1,3\}st"),
+        ])
+        .assert()
+        .success()
+        .stderr(predicate::str::is_empty())
+        .stdout(predicate::str::contains("teeest"));
+
+    Command::cargo_bin("find")
+        .expect("found binary")
+        .args(&[
+            &temp_dir_path,
+            "-regextype",
+            "sed",
+            "-regex",
+            &fix_up_regex_slashes(r".*/te\{1,3\}st"),
+        ])
+        .assert()
+        .success()
+        .stderr(predicate::str::is_empty())
+        .stdout(predicate::str::contains("teeest"));
 }
 
 #[test]