add #[non_exhaustive]

youknowone · youknowone · commit 9377134161c7 · 2022-01-22T20:22:58.000+09:00
diff --git a/ast/src/constant.rs b/ast/src/constant.rs
@@ -94,16 +94,15 @@ impl ConversionFlag {
 }
 
 #[cfg(feature = "constant-optimization")]
+#[non_exhaustive]
 #[derive(Default)]
-pub struct ConstantOptimizer {
-    _priv: (),
-}
+pub struct ConstantOptimizer {}
 
 #[cfg(feature = "constant-optimization")]
 impl ConstantOptimizer {
     #[inline]
     pub fn new() -> Self {
-        Self { _priv: () }
+        Self {}
     }
 }
 
diff --git a/jit/src/lib.rs b/jit/src/lib.rs
@@ -13,6 +13,7 @@ use instructions::FunctionCompiler;
 use std::mem::ManuallyDrop;
 
 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum JitCompileError {
     #[error("function can't be jitted")]
     NotSupported,
@@ -23,6 +24,7 @@ pub enum JitCompileError {
 }
 
 #[derive(Debug, thiserror::Error, Eq, PartialEq)]
+#[non_exhaustive]
 pub enum JitArgumentError {
     #[error("argument is of wrong type")]
     ArgumentTypeMismatch,
@@ -167,6 +169,7 @@ impl JitSig {
 }
 
 #[derive(Debug, Clone, PartialEq)]
+#[non_exhaustive]
 pub enum JitType {
     Int,
     Float,
@@ -192,6 +195,7 @@ impl JitType {
 }
 
 #[derive(Debug, Clone, PartialEq)]
+#[non_exhaustive]
 pub enum AbiValue {
     Float(f64),
     Int(i64),
diff --git a/src/lib.rs b/src/lib.rs
@@ -310,16 +310,15 @@ fn add_stdlib(vm: &mut VirtualMachine) {
 //github.com/ Create settings by examining command line arguments and environment
 //github.com/ variables.
 fn create_settings(matches: &ArgMatches) -> PySettings {
-    let mut settings = PySettings {
-        isolated: matches.is_present("isolate"),
-        ignore_environment: matches.is_present("ignore-environment"),
-        interactive: !matches.is_present("c")
-            && !matches.is_present("m")
-            && (!matches.is_present("script") || matches.is_present("inspect")),
-        bytes_warning: matches.occurrences_of("bytes-warning"),
-        no_site: matches.is_present("no-site"),
-        ..Default::default()
-    };
+    let mut settings = PySettings::default();
+    settings.isolated = matches.is_present("isolate");
+    settings.ignore_environment = matches.is_present("ignore-environment");
+    settings.interactive = !matches.is_present("c")
+        && !matches.is_present("m")
+        && (!matches.is_present("script") || matches.is_present("inspect"));
+    settings.bytes_warning = matches.occurrences_of("bytes-warning");
+    settings.no_site = matches.is_present("no-site");
+
     let ignore_environment = settings.ignore_environment || settings.isolated;
 
     // when rustpython-vm/pylib is enabled, PySettings::default().path_list has pylib::LIB_PATH
diff --git a/vm/src/builtins/function/jitfunc.rs b/vm/src/builtins/function/jitfunc.rs
@@ -31,6 +31,7 @@ impl IntoPyObject for AbiValue {
             AbiValue::Int(i) => i.into_pyobject(vm),
             AbiValue::Float(f) => f.into_pyobject(vm),
             AbiValue::Bool(b) => b.into_pyobject(vm),
+            _ => unimplemented!(),
         }
     }
 }
diff --git a/vm/src/stdlib/posix.rs b/vm/src/stdlib/posix.rs
@@ -160,7 +160,7 @@ pub mod module {
 
     // Flags for os_access
     bitflags! {
-        pub struct AccessFlags: u8{
+        pub struct AccessFlags: u8 {
             const F_OK = _os::F_OK;
             const R_OK = _os::R_OK;
             const W_OK = _os::W_OK;
diff --git a/vm/src/types/slot.rs b/vm/src/types/slot.rs
@@ -14,6 +14,7 @@ use std::cmp::Ordering;
 // The corresponding field in CPython is `tp_` prefixed.
 // e.g. name -> tp_name
 #[derive(Default)]
+#[non_exhaustive]
 pub struct PyTypeSlots {
     pub name: PyRwLock<Option<String>>, // tp_name, not class name
     // tp_basicsize, tp_itemsize
@@ -84,6 +85,7 @@ impl std::fmt::Debug for PyTypeSlots {
 }
 
 bitflags! {
+    #[non_exhaustive]
     pub struct PyTypeFlags: u64 {
         const HEAPTYPE = 1 << 9;
         const BASETYPE = 1 << 10;
diff --git a/vm/src/types/zoo.rs b/vm/src/types/zoo.rs
@@ -9,6 +9,7 @@ use crate::{PyContext, StaticType};
 
 //github.com/ Holder of references to builtin types.
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub struct TypeZoo {
     pub async_generator: PyTypeRef,
     pub async_generator_asend: PyTypeRef,
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -133,6 +133,7 @@ pub enum InitParameter {
 }
 
 //github.com/ Struct containing all kind of settings for the python vm.
+#[non_exhaustive]
 pub struct PySettings {
     //github.com/ -d command line switch
     pub debug: bool,

Original file line number	Diff line number	Diff line change
`@@ -94,16 +94,15 @@ impl ConversionFlag {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`#[cfg(feature = "constant-optimization")]`
	`97`	`+#[non_exhaustive]`
`97`	`98`	`#[derive(Default)]`
`98`		`-pub struct ConstantOptimizer {`
`99`		`- _priv: (),`
`100`		`-}`
	`99`	`+pub struct ConstantOptimizer {}`
`101`	`100`
`102`	`101`	`#[cfg(feature = "constant-optimization")]`
`103`	`102`	`impl ConstantOptimizer {`
`104`	`103`	`#[inline]`
`105`	`104`	`pub fn new() -> Self {`
`106`		`- Self { _priv: () }`
	`105`	`+ Self {}`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ impl IntoPyObject for AbiValue {`
`31`	`31`	`AbiValue::Int(i) => i.into_pyobject(vm),`
`32`	`32`	`AbiValue::Float(f) => f.into_pyobject(vm),`
`33`	`33`	`AbiValue::Bool(b) => b.into_pyobject(vm),`
	`34`	`+ _ => unimplemented!(),`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ pub enum InitParameter {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`//github.com/ Struct containing all kind of settings for the python vm.`
	`136`	`+#[non_exhaustive]`
`136`	`137`	`pub struct PySettings {`
`137`	`138`	`//github.com/ -d command line switch`
`138`	`139`	`pub debug: bool,`