librustc: Take the parameter space into account when combining type#15356

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

pcwalton:wrong-implementorpcwalton/rust:wrong-implementorCopy head branch name to clipboard