Merge pull request #2008 from clarcharr/non_exhaustive

Future-proofing enums/structs with #[non_exhaustive] attribute

Author: scottmcm