Merge branch 'master' of github.com:Lymia/enumset

author Alissa Rao <lymia@lymiahugs.com>

Mon, 25 Jan 2021 22:17:23 +0000 (14:17 -0800)

committer Alissa Rao <lymia@lymiahugs.com>

Mon, 25 Jan 2021 22:17:23 +0000 (14:17 -0800)
author Alissa Rao <lymia@lymiahugs.com>
Mon, 25 Jan 2021 22:17:23 +0000 (14:17 -0800)
committer Alissa Rao <lymia@lymiahugs.com>
Mon, 25 Jan 2021 22:17:23 +0000 (14:17 -0800)
diff --cc enumset/Cargo.toml
Simple merge
diff --cc enumset/src/lib.rs
Simple merge
diff --cc enumset_derive/src/lib.rs
Simple merge
author	Alissa Rao <lymia@lymiahugs.com>
	Mon, 25 Jan 2021 22:17:23 +0000 (14:17 -0800)
committer	Alissa Rao <lymia@lymiahugs.com>
	Mon, 25 Jan 2021 22:17:23 +0000 (14:17 -0800)
		1	2
enumset/Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history
enumset/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history
enumset_derive/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history