Refactor #1393

Job	Run time
lint	1m 13s
cargo-deny (aarch64-apple-ios)	21s
test (ubuntu-latest, stable)	3m 4s
cargo-deny (aarch64-linux-android)	24s
test (ubuntu-latest, beta)	3m 4s
cargo-deny (i686-pc-windows-gnu)	19s
test (ubuntu-latest, 1.65.0)	3m 8s
cargo-deny (i686-pc-windows-msvc)	23s
test (macos-latest, stable)	6m 0s
cargo-deny (i686-unknown-linux-gnu)	20s
test (macos-latest, beta)	7m 21s
cargo-deny (wasm32-unknown-unknown)	23s
test (macos-latest, 1.65.0)	3m 40s
cargo-deny (x86_64-apple-darwin)	19s
test (windows-latest, stable)	6m 14s
cargo-deny (x86_64-apple-ios)	19s
test (windows-latest, beta)	7m 6s
cargo-deny (x86_64-pc-windows-gnu)	26s
test (windows-latest, 1.65.0)	3m 3s
cargo-deny (x86_64-pc-windows-msvc)	19s
cargo-deny (x86_64-unknown-linux-gnu)	19s
cargo-deny (x86_64-unknown-redox)	23s
	48m 8s

Provide feedback