Fix compilation without compiler feature

coolreader18 · youknowone · commit d98f1317861e · 2023-02-17T23:44:43.000+09:00
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -6,11 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
+default = ["compiler"]
 threading = ["rustpython-common/threading", "rustpython-vm/threading"]
 zlib = ["libz-sys", "flate2/zlib"]
 bz2 = ["bzip2"]
 ssl = ["openssl", "openssl-sys", "foreign-types-shared"]
 ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"]
+compiler = ["rustpython-vm/compiler"]
 
 [dependencies]
 # rustpython crates
diff --git a/stdlib/src/dis.rs b/stdlib/src/dis.rs
@@ -15,8 +15,18 @@ mod decl {
             PyRef::try_from_object(vm, co)?
         } else if let Ok(co_str) = PyStrRef::try_from_object(vm, obj.clone()) {
             // String:
-            vm.compile(co_str.as_str(), compiler::Mode::Exec, "<dis>".to_owned())
-                .map_err(|err| vm.new_syntax_error(&err))?
+            #[cfg(feature = "compiler")]
+            {
+                vm.compile(co_str.as_str(), compiler::Mode::Exec, "<dis>".to_owned())
+                    .map_err(|err| vm.new_syntax_error(&err))?
+            }
+            #[cfg(not(feature = "compiler"))]
+            {
+                let _ = co_str;
+                return Err(
+                    vm.new_not_implemented_error("compiler feature is turned off".to_owned())
+                );
+            }
         } else {
             PyRef::try_from_object(vm, obj)?
         };
diff --git a/vm/src/vm/vm_new.rs b/vm/src/vm/vm_new.rs
@@ -228,7 +228,6 @@ impl VirtualMachine {
         self.new_exception_msg(overflow_error, msg)
     }
 
-    #[cfg(any(feature = "rustpython-parser", feature = "rustpython-codegen"))]
     pub fn new_syntax_error(&self, error: &crate::compiler::CompileError) -> PyBaseExceptionRef {
         let syntax_error_type = match &error.error {
             #[cfg(feature = "rustpython-parser")]

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,6 @@ impl VirtualMachine {`
`228`	`228`	`self.new_exception_msg(overflow_error, msg)`
`229`	`229`	`}`
`230`	`230`
`231`		`- #[cfg(any(feature = "rustpython-parser", feature = "rustpython-codegen"))]`
`232`	`231`	`pub fn new_syntax_error(&self, error: &crate::compiler::CompileError) -> PyBaseExceptionRef {`
`233`	`232`	`let syntax_error_type = match &error.error {`
`234`	`233`	`#[cfg(feature = "rustpython-parser")]`