Rebase of #2818 and #2817 #2120

Job	Run time	Billable time
rustfmt-clippy	31s	0s
minimal	10s	0s
msrv	49s	0s
check-cfg	20s	0s
docs	24s	0s
quickchecking	14s	0s
test (ubuntu-latest, 9.0, 1, 0, 0, 0, 0)	1m 57s	0s
test-expectations (ubuntu-latest)	46s	0s
test-book	7s	0s
test (ubuntu-latest, 9.0, 1, 0, 0, 1, 0)	1m 48s	0s
test-expectations (macos-12)	3m 17s	0s
test (ubuntu-latest, 9.0, 1, 0, 1, 0, 0)	1m 53s	0s
test (ubuntu-latest, 9.0, 1, 0, 1, 1, 0)	2m 26s	0s
test (ubuntu-latest, 9.0, 1, 1, 0, 0, 0)	2m 14s	0s
test (ubuntu-latest, 9.0, 1, 1, 0, 1, 0)	2m 13s	0s
test (ubuntu-latest, 9.0, 1, 1, 1, 0, 0)	2m 36s	0s
test (ubuntu-latest, 9.0, 1, 1, 1, 1, 0)	2m 16s	0s
test (ubuntu-latest, 16.0, 1, 0, 0, 0, 0)	2m 34s	0s
test (ubuntu-latest, 16.0, 1, 0, 0, 1, 0)	2m 31s	0s
test (ubuntu-latest, 16.0, 1, 0, 1, 0, 0)	2m 34s	0s
test (ubuntu-latest, 16.0, 1, 0, 1, 1, 0)	2m 31s	0s
test (ubuntu-latest, 16.0, 1, 1, 0, 0, 0)	3m 11s	0s
test (ubuntu-latest, 16.0, 1, 1, 0, 1, 0)	2m 52s	0s
test (ubuntu-latest, 16.0, 1, 1, 1, 0, 0)	3m 0s	0s
test (ubuntu-latest, 16.0, 1, 1, 1, 1, 0)	2m 58s	0s
test (ubuntu-latest, 16.0, 0, 0, 1)	1m 46s	0s
test (macos-12, 9.0, 0, 0, 0)	1m 45s	0s
success	1s	0s
	49m 44s	0s

Provide feedback