refactor

simplify baseline parsing

Sebastian Thiel committed 4 years ago

Commit 02fba2c1 parent 44991d35 files · +17 −20Browse files

Unified · Split

5 files

Cargo.lock +0 −1
git-config/Cargo.toml +1 −1
git-pathspec/Cargo.toml +0 −1
git-pathspec/tests/fixtures/generate_pathspec_baseline.sh +2 −0
git-pathspec/tests/pathspec.rs +14 −17

@@ -1425,7 +1425,6 @@ dependencies = [ · 1424 unmodified lines
1425	"git-testtools",	1425	"git-testtools",
1426	"once_cell",	1426	"once_cell",
1427	"thiserror",	1427	"thiserror",
1428	"walkdir",
1429	]	1428	]
1430		1429
1431	[[package]]	1430	[[package]]

git-config/Cargo.toml+1−1

@@ -14,7 +14,7 @@ include = ["src/*/", "LICENSE-*", "README.md", "CHANGELOG.md"] · 13 unmodified lines
14	# serde = ["serde_crate"]	14	# serde = ["serde_crate"]
15		15
16	[dependencies]	16	[dependencies]
17	git-features = { version = "^0.21.0", path = "../git-features"}	17	git-features = { version = "^0.21.0", path = "../git-features" }
18	git-path = { version = "^0.1.2", path = "../git-path" }	18	git-path = { version = "^0.1.2", path = "../git-path" }
19	git-sec = { version = "^0.1.1", path = "../git-sec" }	19	git-sec = { version = "^0.1.1", path = "../git-sec" }
20	git-ref = { version = "0.13.0", path = "../git-ref" }	20	git-ref = { version = "0.13.0", path = "../git-ref" }

git-pathspec/Cargo.toml+0−1

@@ -24,4 +24,3 @@ compact_str = "0.3.2" · 23 unmodified lines
24	[dev-dependencies]	24	[dev-dependencies]
25	git-testtools = { path = "../tests/tools" }	25	git-testtools = { path = "../tests/tools" }
26	once_cell = "1.12.0"	26	once_cell = "1.12.0"
27	walkdir = "2.3.2"

git-pathspec/tests/fixtures/generate_pathspec_baseline.sh+2−0

@@ -1,6 +1,8 @@
1	#!/bin/bash	1	#!/bin/bash
2	set -eu -o pipefail	2	set -eu -o pipefail
3		3
		4	git init;
		5
4	function baseline() {	6	function baseline() {
5	local pathspec=$1 # first argument is the pathspec to test	7	local pathspec=$1 # first argument is the pathspec to test
6		8

git-pathspec/tests/pathspec.rs+14−17

-use bstr::{BString, ByteSlice};
+use bstr::{BStr, BString, ByteSlice};
 use git_attributes::State;
 use git_pathspec::{MagicSignature, Pattern, SearchMode};
 use once_cell::sync::Lazy;
 use std::collections::HashMap;
-static BASELINE: Lazy<HashMap<BString, BString>> = Lazy::new(|| {
+pub use git_testtools::Result;
-    let mut baseline_map = HashMap::new();
+static BASELINE: Lazy<HashMap<BString, usize>> = Lazy::new(|| {
     let base = git_testtools::scripted_fixture_repo_read_only("generate_pathspec_baseline.sh").unwrap();
-    let dirwalk = walkdir::WalkDir::new(base)
+    (|| -> Result<_> {
-        .max_depth(1)
+        let mut map = HashMap::new();
-        .follow_links(false)
+        let baseline = std::fs::read(base.join("baseline.git"))?;
-        .into_iter()
-        .filter_map(|e| e.ok().and_then(|e| (e.file_name() == "baseline.git").then(|| e)));
-    for baseline_entry in dirwalk {
-        let baseline = std::fs::read(baseline_entry.path()).unwrap();
         let mut lines = baseline.lines();
         while let Some(spec) = lines.next() {
-            let exit_code = lines.next().unwrap().into();
+            let exit_code = lines.next().expect("two lines per baseline").to_str()?.parse()?;
-            baseline_map.insert(spec.into(), exit_code);
+            map.insert(spec.into(), exit_code);
         }
-    }
+        Ok(map)
-    baseline_map
+    })()
+    .unwrap()
 });
 mod succeed {
 }
 fn check_against_baseline(pathspec: &str) -> bool {
+    let key: &BStr = pathspec.into();
     let base = BASELINE
-        .get(&BString::from(pathspec))
+        .get(key)
         .expect(&format!("missing baseline for pathspec: {:?}", pathspec));
-    *base == BString::from("0")
+    *base == 0
 }