improve [match_same_arms] messages, enable rustfix test
#12794
Merged
match_same_arms] messages, enable rustfix test
#12794