adjust to renaming of git-pathspec to gix-pathspec

Byron · Byron · commit 37f7c6b9070e · 2023-02-16T20:44:22.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -163,7 +163,7 @@ jobs:
       - name: Install Rust
         run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v2
-      - run: set +x; for name in gix-actor gix-attributes git-bitmap git-chunk git-command git-commitgraph git-date gix-glob gix-hash git-hashtable git-mailmap gix-object git-packetline gix-path git-pathspec gix-quote git-refspec git-revision git-traverse gix-validate; do (cd $name && cargo build --target ${{ matrix.target }}); done
+      - run: set +x; for name in gix-actor gix-attributes git-bitmap git-chunk git-command git-commitgraph git-date gix-glob gix-hash git-hashtable git-mailmap gix-object git-packetline gix-path gix-pathspec gix-quote git-refspec git-revision git-traverse gix-validate; do (cd $name && cargo build --target ${{ matrix.target }}); done
         name: crates without feature toggles
       - run: set +x; for feature in progress fs-walkdir-parallel parallel io-pipe crc32 zlib zlib-rust-backend fast-sha1 rustsha1 cache-efficiency-debug; do (cd gix-features && cargo build --features $feature --target ${{ matrix.target }}); done
         name: features of gix-features
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -169,7 +169,7 @@ members = [
     "gix-tempfile",
     "gix-lock",
     "gix-attributes",
-    "git-pathspec",
+    "gix-pathspec",
     "git-refspec",
     "gix-path",
     "gix",
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ is usable to some extent.
   * [gix-path](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-path)
   * [gix](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix)
   * [gix-attributes](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-attributes)
-  * [git-pathspec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-pathspec)
+  * [gix-pathspec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-pathspec)
   * [git-index](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-index)
   * [git-revision](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-revision)
   * [git-command](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-command)
diff --git a/crate-status.md b/crate-status.md
@@ -349,7 +349,7 @@ Check out the [performance discussion][git-traverse-performance] as well.
     * [ ] parse
     * [ ] check for match
 
-### git-pathspec
+### gix-pathspec
 * [x] parse
 * [ ] matching of paths
 
diff --git a/etc/check-package-size.sh b/etc/check-package-size.sh
@@ -17,7 +17,7 @@ function indent () {
 echo "in root: gitoxide CLI"
 (enter cargo-smart-release && indent cargo diet -n --package-size-limit 100KB)
 (enter gix-actor && indent cargo diet -n --package-size-limit 5KB)
-(enter git-pathspec && indent cargo diet -n --package-size-limit 25KB)
+(enter gix-pathspec && indent cargo diet -n --package-size-limit 25KB)
 (enter git-refspec && indent cargo diet -n --package-size-limit 25KB)
 (enter gix-path && indent cargo diet -n --package-size-limit 20KB)
 (enter gix-attributes && indent cargo diet -n --package-size-limit 20KB)
diff --git a/gix-path/src/spec.rs b/gix-path/src/spec.rs
@@ -25,7 +25,7 @@ fn assert_valid_hack(input: &BStr) {
 
 impl Spec {
     /// Parse `input` into a `Spec` or `None` if it could not be parsed
-    // TODO: tests, actual implementation probably via `git-pathspec` to make use of the crate after all.
+    // TODO: tests, actual implementation probably via `gix-pathspec` to make use of the crate after all.
     pub fn from_bytes(input: &BStr) -> Option<Self> {
         assert_valid_hack(input);
         Spec(input.into()).into()
diff --git a/gix-pathspec/Cargo.toml b/gix-pathspec/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "git-pathspec"
+name = "gix-pathspec"
 version = "0.1.0"
 repository = "https://github.com/Byron/gitoxide"
 license = "MIT/Apache-2.0"
diff --git a/gix-pathspec/README.md b/gix-pathspec/README.md
@@ -1,4 +1,4 @@
-# `git-pathspec`
+# `gix-pathspec`
 
 ### Testing
 
diff --git a/gix-pathspec/fuzz/Cargo.lock b/gix-pathspec/fuzz/Cargo.lock
diff --git a/gix-pathspec/fuzz/Cargo.toml b/gix-pathspec/fuzz/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "git-pathspec-fuzz"
+name = "gix-pathspec-fuzz"
 version = "0.0.0"
 authors = ["Automatically generated"]
 publish = false
@@ -11,7 +11,7 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.4"
 
-[dependencies.git-pathspec]
+[dependencies.gix-pathspec]
 path = ".."
 
 # Prevent this from interfering with workspaces
diff --git a/gix-pathspec/fuzz/fuzz_targets/parse.rs b/gix-pathspec/fuzz/fuzz_targets/parse.rs
@@ -2,5 +2,5 @@
 use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
-    let _a = git_pathspec::parse(data);
+    let _a = gix_pathspec::parse(data);
 });
diff --git a/gix-pathspec/tests/pathspec.rs b/gix-pathspec/tests/pathspec.rs
@@ -4,8 +4,8 @@ mod parse {
     use std::collections::HashMap;
 
     use bstr::{BStr, BString, ByteSlice};
-    use git_pathspec::{MagicSignature, MatchMode, Pattern};
     use gix_attributes::State;
+    use gix_pathspec::{MagicSignature, MatchMode, Pattern};
     use once_cell::sync::Lazy;
 
     #[derive(Debug, Clone, PartialEq, Eq)]
@@ -50,7 +50,7 @@ mod parse {
     #[test]
     fn baseline() {
         for (pattern, exit_code) in BASELINE.iter() {
-            let res = git_pathspec::parse(pattern);
+            let res = gix_pathspec::parse(pattern);
             assert_eq!(
                 res.is_ok(),
                 *exit_code == 0,
@@ -60,8 +60,8 @@ mod parse {
     }
 
     mod succeed {
-        use git_pathspec::{MagicSignature, MatchMode};
         use gix_attributes::State;
+        use gix_pathspec::{MagicSignature, MatchMode};
 
         use crate::parse::{
             check_valid_inputs, pat, pat_with_attrs, pat_with_path, pat_with_path_and_sig, pat_with_search_mode,
@@ -258,7 +258,7 @@ mod parse {
     }
 
     mod fail {
-        use git_pathspec::parse::Error;
+        use gix_pathspec::parse::Error;
 
         use crate::parse::check_against_baseline;
 
@@ -268,7 +268,7 @@ mod parse {
 
             assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-            let output = git_pathspec::parse(input.as_bytes());
+            let output = gix_pathspec::parse(input.as_bytes());
             assert!(output.is_err());
             assert!(matches!(output.unwrap_err(), Error::EmptyString));
         }
@@ -283,7 +283,7 @@ mod parse {
             for input in inputs.into_iter() {
                 assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-                let output = git_pathspec::parse(input.as_bytes());
+                let output = gix_pathspec::parse(input.as_bytes());
                 assert!(output.is_err());
                 assert!(matches!(output.unwrap_err(), Error::Unimplemented { .. }));
             }
@@ -301,7 +301,7 @@ mod parse {
             for input in inputs.into_iter() {
                 assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-                let output = git_pathspec::parse(input.as_bytes());
+                let output = gix_pathspec::parse(input.as_bytes());
                 assert!(output.is_err());
                 assert!(matches!(output.unwrap_err(), Error::InvalidKeyword { .. }));
             }
@@ -319,7 +319,7 @@ mod parse {
             for input in inputs {
                 assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-                let output = git_pathspec::parse(input.as_bytes());
+                let output = gix_pathspec::parse(input.as_bytes());
                 assert!(output.is_err(), "This pathspec did not produce an error {input}");
                 assert!(matches!(output.unwrap_err(), Error::InvalidAttribute { .. }));
             }
@@ -341,7 +341,7 @@ mod parse {
             for input in inputs {
                 assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-                let output = git_pathspec::parse(input.as_bytes());
+                let output = gix_pathspec::parse(input.as_bytes());
                 assert!(output.is_err(), "This pathspec did not produce an error {input}");
                 assert!(
                     matches!(output.unwrap_err(), Error::InvalidAttributeValue { .. }),
@@ -361,7 +361,7 @@ mod parse {
             for input in inputs {
                 assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-                let output = git_pathspec::parse(input.as_bytes());
+                let output = gix_pathspec::parse(input.as_bytes());
                 assert!(output.is_err(), "This pathspec did not produce an error {input}");
                 assert!(matches!(output.unwrap_err(), Error::TrailingEscapeCharacter));
             }
@@ -373,7 +373,7 @@ mod parse {
 
             assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-            let output = git_pathspec::parse(input.as_bytes());
+            let output = gix_pathspec::parse(input.as_bytes());
             assert!(output.is_err());
             assert!(matches!(output.unwrap_err(), Error::EmptyAttribute));
         }
@@ -384,7 +384,7 @@ mod parse {
 
             assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-            let output = git_pathspec::parse(input.as_bytes());
+            let output = gix_pathspec::parse(input.as_bytes());
             assert!(output.is_err());
             assert!(matches!(output.unwrap_err(), Error::MultipleAttributeSpecifications));
         }
@@ -395,7 +395,7 @@ mod parse {
 
             assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-            let output = git_pathspec::parse(input.as_bytes());
+            let output = gix_pathspec::parse(input.as_bytes());
             assert!(output.is_err());
             assert!(matches!(output.unwrap_err(), Error::MissingClosingParenthesis { .. }));
         }
@@ -406,7 +406,7 @@ mod parse {
 
             assert!(!check_against_baseline(input), "This pathspec is valid in git: {input}");
 
-            let output = git_pathspec::parse(input.as_bytes());
+            let output = gix_pathspec::parse(input.as_bytes());
             assert!(output.is_err());
             assert!(matches!(output.unwrap_err(), Error::IncompatibleSearchModes));
         }
@@ -419,7 +419,7 @@ mod parse {
                 "This pathspec is invalid in git: {input}"
             );
 
-            let pattern: PatternForTesting = git_pathspec::parse(input.as_bytes())
+            let pattern: PatternForTesting = gix_pathspec::parse(input.as_bytes())
                 .unwrap_or_else(|_| panic!("parsing should not fail with pathspec {input}"))
                 .into();
             assert_eq!(pattern, expected, "while checking input: \"{input}\"");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-# `git-pathspec`
	`1`	+# `gix-pathspec`
`2`	`2`
`3`	`3`	`### Testing`
`4`	`4`