incr.comp.: Minor refactoring and update to struct ICH test case#36831

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

michaelwoerister:ich-updatesmichaelwoerister/rust:ich-updatesCopy head branch name to clipboard