Un-feature-gate struct variants

Bring up to date with
https://github.com/rust-lang/rust/commit/579c65da1babbcfa5f3fd1cb5a1062acbe5b61eb
Merge branch 'pull'