Merge branch 'yarn'

Sebastian Thiel committed 3 years ago

Commit 53bbd062 parents 14312b6 0fac1b910 files · +64 −47Browse files

Unified · Split

10 files

Cargo.lock +7 −2
gitoxide-core/src/repository/index/entries.rs +16 −3
gix-attributes/Cargo.toml +2 −2
gix-attributes/src/lib.rs +3 −8
gix-attributes/src/name.rs +7 −3
gix-attributes/src/parse.rs +2 −3
gix-attributes/src/search/mod.rs +3 −3
gix-attributes/src/search/outcome.rs +10 −7
gix-attributes/src/state.rs +13 −15
gix-attributes/tests/search/mod.rs +1 −1

@@ -395,6 +395,12 @@ dependencies = [ · 394 unmodified lines
395	395	"serde",
396	396	]
397	397
	398	+[[package]]
	399	+name = "byteyarn"
	400	+version = "0.2.3"
	401	+source = "registry+https://github.com/rust-lang/crates.io-index"
	402	+checksum = "a7534301c0ea17abb4db06d75efc7b4b0fa360fce8e175a4330d721c71c942ff"
	403	+
398	404	[[package]]
399	405	name = "cassowary"
400	406	version = "0.3.0"
@@ -1336,6 +1342,7 @@ name = "gix-attributes" · 935 unmodified lines
1336	1342	version = "0.18.0"
1337	1343	dependencies = [
1338	1344	"bstr",
	1345	+ "byteyarn",
1339	1346	"document-features",
1340	1347	"gix-fs 0.6.0",
1341	1348	"gix-glob 0.12.0",
@@ -1343,7 +1350,6 @@ dependencies = [ · 1 unmodified line
1343	1350	"gix-quote 0.4.7",
1344	1351	"gix-testtools",
1345	1352	"gix-trace 0.1.3",
1346		− "kstring",
1347	1353	"serde",
1348	1354	"smallvec",
1349	1355	"thiserror",
@@ -2962,7 +2968,6 @@ version = "2.0.0" · 1612 unmodified lines
2962	2968	source = "registry+https://github.com/rust-lang/crates.io-index"
2963	2969	checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
2964	2970	dependencies = [
2965		− "serde",
2966	2971	"static_assertions",
2967	2972	]
2968	2973

gitoxide-core/src/repository/index/entries.rs+16−3

@@ -294,7 +294,13 @@ pub(crate) mod function { · 293 unmodified lines
294	294	Ok((pathspec.into_parts().0, index, cache))
295	295	}
296	296
297		− #[cfg_attr(feature = "serde", derive(serde::Serialize))]
	297	+ #[cfg(feature = "serde")]
	298	+ #[derive(serde::Serialize)]
	299	+ struct AttrsForSerde {
	300	+ is_excluded: bool,
	301	+ attributes: Vec<String>,
	302	+ }
	303	+
298	304	struct Attrs {
299	305	is_excluded: bool,
300	306	attributes: Vec<gix::attrs::Assignment>,
@@ -331,7 +337,7 @@ pub(crate) mod function { · 30 unmodified lines
331	337	flags: u32,
332	338	mode: u32,
333	339	path: std::borrow::Cow<'a, str>,
334		− meta: Option<Attrs>,
	340	+ meta: Option<AttrsForSerde>,
335	341	}
336	342
337	343	serde_json::to_writer(
@@ -348,7 +354,14 @@ pub(crate) mod function { · 10 unmodified lines
348	354	path.extend_from_slice(entry.path(index));
349	355	path.to_string().into()
350	356	},
351		− meta: attrs,
	357	+ meta: attrs.map(\|attrs\| AttrsForSerde {
	358	+ is_excluded: attrs.is_excluded,
	359	+ attributes: attrs
	360	+ .attributes
	361	+ .into_iter()
	362	+ .map(\|attr\| attr.as_ref().to_string())
	363	+ .collect(),
	364	+ }),
352	365	},
353	366	)?;
354	367

gix-attributes/Cargo.toml+2−2

@@ -14,7 +14,7 @@ doctest = false · 13 unmodified lines
14	14
15	15	[features]
16	16	## Data structures implement `serde::Serialize` and `serde::Deserialize`.
17		−serde = ["dep:serde", "bstr/serde", "gix-glob/serde", "kstring/serde"]
	17	+serde = ["dep:serde", "bstr/serde", "gix-glob/serde"]
18	18
19	19	[dependencies]
20	20	gix-path = { version = "^0.10.0", path = "../gix-path" }
@@ -24,7 +24,7 @@ gix-trace = { version = "^0.1.3", path = "../gix-trace" } · 3 unmodified lines
24	24
25	25	bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
26	26	smallvec = "1.10.0"
27		−kstring = "2.0.0"
	27	+byteyarn = "0.2.3"
28	28	unicode-bom = "2.0.2"
29	29	thiserror = "1.0.26"
30	30	serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}

gix-attributes/src/lib.rs+3−8

@@ -8,8 +8,8 @@ · 7 unmodified lines
8	8	#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
9	9	#![deny(missing_docs, rust_2018_idioms, unsafe_code)]
10	10
	11	+use byteyarn::{Yarn, YarnRef};
11	12	pub use gix_glob as glob;
12		−use kstring::{KString, KStringRef};
13	13
14	14	mod assignment;
15	15	///
@@ -34,7 +34,6 @@ pub fn parse(bytes: &[u8]) -> parse::Lines<'_> { · 18 unmodified lines
34	34	///
35	35	/// Note that this doesn't contain the name.
36	36	#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
37		−#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
38	37	pub enum StateRef<'a> {
39	38	/// The attribute is listed, or has the special value 'true'
40	39	Set,
@@ -42,7 +41,6 @@ pub enum StateRef<'a> { · 1 unmodified line
42	41	Unset,
43	42	/// The attribute is set to the given value, which followed the `=` sign.
44	43	/// Note that values can be empty.
45		− #[cfg_attr(feature = "serde", serde(borrow))]
46	44	Value(state::ValueRef<'a>),
47	45	/// The attribute isn't mentioned with a given path or is explicitly set to `Unspecified` using the `!` sign.
48	46	Unspecified,
@@ -52,7 +50,6 @@ pub enum StateRef<'a> { · 3 unmodified lines
52	50	///
53	51	/// Note that this doesn't contain the name.
54	52	#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
55		−#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
56	53	pub enum State {
57	54	/// The attribute is listed, or has the special value 'true'
58	55	Set,
@@ -67,16 +64,14 @@ pub enum State { · 8 unmodified lines
67	64
68	65	/// Represents a validated attribute name
69	66	#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
70		−#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
71		−pub struct Name(pub(crate) KString);
	67	+pub struct Name(pub(crate) Yarn);
72	68
73	69	/// Holds a validated attribute name as a reference
74	70	#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, Ord, PartialOrd)]
75		−pub struct NameRef<'a>(KStringRef<'a>);
	71	+pub struct NameRef<'a>(YarnRef<'a, str>);
76	72
77	73	/// Name an attribute and describe it's assigned state.
78	74	#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
79		−#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
80	75	pub struct Assignment {
81	76	/// The validated name of the attribute.
82	77	pub name: Name,

gix-attributes/src/name.rs+7−3

@@ -1,12 +1,16 @@
1	1	use bstr::{BStr, BString, ByteSlice};
2		−use kstring::KStringRef;
	2	+use byteyarn::YarnRef;
3	3
4	4	use crate::{Name, NameRef};
5	5
6	6	impl<'a> NameRef<'a> {
7	7	/// Turn this ref into its owned counterpart.
8	8	pub fn to_owned(self) -> Name {
9		− Name(self.0.into())
	9	+ Name(
	10	+ self.0
	11	+ .immortalize()
	12	+ .map_or_else(\|\| self.0.to_boxed_str().into(), YarnRef::to_box),
	13	+ )
10	14	}
11	15
12	16	/// Return the inner `str`.
@@ -35,7 +39,7 @@ impl<'a> TryFrom<&'a BStr> for NameRef<'a> { · 22 unmodified lines
35	39	}
36	40
37	41	attr_valid(attr)
38		− .then(\|\| NameRef(KStringRef::from_ref(attr.to_str().expect("no illformed utf8"))))
	42	+ .then(\|\| NameRef(YarnRef::from(attr.to_str().expect("no illformed utf8"))))
39	43	.ok_or_else(\|\| Error { attribute: attr.into() })
40	44	}
41	45	}

gix-attributes/src/parse.rs+2−3

@@ -1,13 +1,12 @@
1	1	use std::borrow::Cow;
2	2
3	3	use bstr::{BStr, ByteSlice};
4		−use kstring::KStringRef;
	4	+use byteyarn::YarnRef;
5	5
6	6	use crate::{name, AssignmentRef, Name, NameRef, StateRef};
7	7
8	8	/// The kind of attribute that was parsed.
9	9	#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
10		−#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
11	10	pub enum Kind {
12	11	/// A pattern to match paths against
13	12	Pattern(gix_glob::Pattern),
@@ -76,7 +75,7 @@ fn check_attr(attr: &BStr) -> Result<NameRef<'_>, name::Error> { · 62 unmodified lines
76	75	}
77	76
78	77	attr_valid(attr)
79		− .then(\|\| NameRef(KStringRef::from_ref(attr.to_str().expect("no illformed utf8"))))
	78	+ .then(\|\| NameRef(YarnRef::from(attr.to_str().expect("no illformed utf8"))))
80	79	.ok_or_else(\|\| name::Error { attribute: attr.into() })
81	80	}
82	81

gix-attributes/src/search/mod.rs+3−3

@@ -1,6 +1,6 @@
1	1	use std::collections::HashMap;
2	2
3		−use kstring::KString;
	3	+use byteyarn::Yarn;
4	4	use smallvec::SmallVec;
5	5
6	6	use crate::{Assignment, AssignmentRef};
@@ -99,7 +99,7 @@ pub struct Outcome { · 92 unmodified lines
99	99	/// A stack of attributes to use for processing attributes of matched patterns and for resolving their macros.
100	100	attrs_stack: SmallVec<[(AttributeId, Assignment, Option<AttributeId>); 8]>,
101	101	/// A set of attributes we should limit ourselves to, or empty if we should fill in all attributes, made of
102		− selected: SmallVec<[(KString, Option<AttributeId>); AVERAGE_NUM_ATTRS]>,
	102	+ selected: SmallVec<[(Yarn, Option<AttributeId>); AVERAGE_NUM_ATTRS]>,
103	103	/// storage for all patterns we have matched so far (in order to avoid referencing them, we copy them, but only once).
104	104	patterns: RefMap<gix_glob::Pattern>,
105	105	/// storage for all assignments we have matched so far (in order to avoid referencing them, we copy them, but only once).
@@ -135,7 +135,7 @@ pub struct MetadataCollection { · 29 unmodified lines
135	135	/// A mapping of an attribute or macro name to its order, that is the time when it was first seen.
136	136	///
137	137	/// This is the inverse of the order attributes are searched.
138		− name_to_meta: HashMap<KString, Metadata>,
	138	+ name_to_meta: HashMap<Yarn, Metadata>,
139	139	}
140	140
141	141	/// Metadata associated with an attribute or macro name.

gix-attributes/src/search/outcome.rs+10−7

@@ -1,6 +1,6 @@
1	1	use bstr::{BString, ByteSlice};
	2	+use byteyarn::Yarn;
2	3	use gix_glob::Pattern;
3		−use kstring::{KString, KStringRef};
4	4
5	5	use crate::{
6	6	search::{
@@ -44,7 +44,7 @@ impl Outcome { · 37 unmodified lines
44	44	pub fn initialize_with_selection<'a>(
45	45	&mut self,
46	46	collection: &MetadataCollection,
47		− attribute_names: impl IntoIterator<Item = impl Into<KStringRef<'a>>>,
	47	+ attribute_names: impl IntoIterator<Item = impl Into<&'a str>>,
48	48	) {
49	49	self.initialize_with_selection_inner(collection, &mut attribute_names.into_iter().map(Into::into))
50	50	}
@@ -52,15 +52,15 @@ impl Outcome { · 1 unmodified line
52	52	fn initialize_with_selection_inner(
53	53	&mut self,
54	54	collection: &MetadataCollection,
55		− attribute_names: &mut dyn Iterator<Item = KStringRef<'_>>,
	55	+ attribute_names: &mut dyn Iterator<Item = &str>,
56	56	) {
57	57	self.initialize(collection);
58	58
59	59	self.selected.clear();
60	60	self.selected.extend(attribute_names.map(\|name\| {
61	61	(
62		− name.to_owned(),
63		− collection.name_to_meta.get(name.as_str()).map(\|meta\| meta.id),
	62	+ Yarn::inlined(name).unwrap_or_else(\|\| name.to_string().into_boxed_str().into()),
	63	+ collection.name_to_meta.get(name).map(\|meta\| meta.id),
64	64	)
65	65	}));
66	66	self.reset_remaining();
@@ -315,7 +315,7 @@ impl MetadataCollection { · 248 unmodified lines
315	315	None => {
316	316	let order = AttributeId(self.name_to_meta.len());
317	317	self.name_to_meta.insert(
318		− KString::from_ref(name),
	318	+ Yarn::inlined(name).unwrap_or_else(\|\| name.to_string().into_boxed_str().into()),
319	319	Metadata {
320	320	id: order,
321	321	macro_attributes: Default::default(),
@@ -335,7 +335,10 @@ impl MetadataCollection { · 13 unmodified lines
335	335	Some(meta) => meta.id,
336	336	None => {
337	337	let order = AttributeId(self.name_to_meta.len());
338		− self.name_to_meta.insert(KString::from_ref(name), order.into());
	338	+ self.name_to_meta.insert(
	339	+ Yarn::inlined(name).unwrap_or_else(\|\| name.to_string().into_boxed_str().into()),
	340	+ order.into(),
	341	+ );
339	342	order
340	343	}
341	344	}

gix-attributes/src/state.rs+13−15

@@ -1,29 +1,21 @@
1	1	use bstr::{BStr, ByteSlice};
2		−use kstring::{KString, KStringRef};
	2	+use byteyarn::{ByteYarn, YarnRef};
3	3
4	4	use crate::{State, StateRef};
5	5
6	6	/// A container to encapsulate a tightly packed and typically unallocated byte value that isn't necessarily UTF8 encoded.
7	7	#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
8		−#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
9		−pub struct Value(KString);
	8	+pub struct Value(ByteYarn);
10	9
11	10	/// A reference container to encapsulate a tightly packed and typically unallocated byte value that isn't necessarily UTF8 encoded.
12	11	#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
13		−#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
14		−pub struct ValueRef<'a>(#[cfg_attr(feature = "serde", serde(borrow))] KStringRef<'a>);
	12	+pub struct ValueRef<'a>(YarnRef<'a, [u8]>);
15	13
16	14	/// Lifecycle
17	15	impl<'a> ValueRef<'a> {
18	16	/// Keep `input` as our value.
19	17	pub fn from_bytes(input: &'a [u8]) -> Self {
20		− Self(KStringRef::from_ref(
21		− // SAFETY: our API makes accessing that value as `str` impossible, so illformed UTF8 is never exposed as such.
22		− #[allow(unsafe_code)]
23		− unsafe {
24		− std::str::from_utf8_unchecked(input)
25		− },
26		− ))
	18	+ Self(YarnRef::from(input))
27	19	}
28	20	}
29	21
@@ -42,19 +34,25 @@ impl ValueRef<'_> { · 12 unmodified lines
42	34
43	35	impl<'a> From<&'a str> for ValueRef<'a> {
44	36	fn from(v: &'a str) -> Self {
45		− ValueRef(v.into())
	37	+ ValueRef(v.as_bytes().into())
46	38	}
47	39	}
48	40
49	41	impl<'a> From<ValueRef<'a>> for Value {
50	42	fn from(v: ValueRef<'a>) -> Self {
51		− Value(v.0.into())
	43	+ Value(
	44	+ v.0.immortalize()
	45	+ .map_or_else(\|\| v.0.to_boxed_bytes().into(), YarnRef::to_box),
	46	+ )
52	47	}
53	48	}
54	49
55	50	impl From<&str> for Value {
56	51	fn from(v: &str) -> Self {
57		− Value(KString::from_ref(v))
	52	+ Value(
	53	+ ByteYarn::inlined(v.as_bytes())
	54	+ .unwrap_or_else(\|\| ByteYarn::from_boxed_bytes(v.as_bytes().to_vec().into_boxed_slice())),
	55	+ )
58	56	}
59	57	}
60	58

gix-attributes/tests/search/mod.rs+1−1

@@ -270,7 +270,7 @@ fn given_attributes_are_made_available_in_given_order() -> crate::Result { · 269 unmodified lines
270	270	fn size_of_outcome() {
271	271	assert_eq!(
272	272	std::mem::size_of::<Outcome>(),
273		− 904,
	273	+ 752,
274	274	"it's quite big, shouldn't change without us noticing"
275	275	)
276	276	}