Merge pull request #1694 from rust-osdev/bishop-xtask-collapse-if

Merge pull request #1694 from rust-osdev/bishop-xtask-collapse-if #537