Sync from rust 539402cb0b0f1639a4be14e40eaf8db61a62ae41

author bjorn3 <bjorn3@users.noreply.github.com>

Sat, 21 Nov 2020 17:43:51 +0000 (18:43 +0100)

committer bjorn3 <bjorn3@users.noreply.github.com>

Sat, 21 Nov 2020 17:43:51 +0000 (18:43 +0100)
author bjorn3 <bjorn3@users.noreply.github.com>
Sat, 21 Nov 2020 17:43:51 +0000 (18:43 +0100)
committer bjorn3 <bjorn3@users.noreply.github.com>
Sat, 21 Nov 2020 17:43:51 +0000 (18:43 +0100)
diff --cc src/base.rs
Simple merge
diff --cc src/common.rs
Simple merge
diff --cc src/constant.rs
Simple merge
author	bjorn3 <bjorn3@users.noreply.github.com>
	Sat, 21 Nov 2020 17:43:51 +0000 (18:43 +0100)
committer	bjorn3 <bjorn3@users.noreply.github.com>
	Sat, 21 Nov 2020 17:43:51 +0000 (18:43 +0100)
		1	2
src/base.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/common.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/constant.rs	patch \|	diff1 \|	diff2 \|	blob \| history