Fix the span for discriminators in non-C-like enums

Fixes #17383.
auto merge of #17415 : jakub-/rust/issue-17383, r=huonw

Fixes #17383.