Use feature for proc_macro_hack

coolreader18 · coolreader18 · commit 86a6b2a3666a · 2019-07-13T00:59:18.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,16 +15,16 @@ name = "bench"
 path = "./benchmarks/bench.rs"
 
 [features]
-default = []
+default = ["rustpython-vm/use-proc-macro-hack"]
 flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
 
 [dependencies]
 log="0.4.1"
 env_logger="0.5.10"
 clap = "2.31.2"
+rustpython-vm = {path = "vm", version = "0.1.0"}
 rustpython-compiler = {path = "compiler", version = "0.1.0"}
 rustpython-parser = {path = "parser", version = "0.1.0"}
-rustpython-vm = {path = "vm", version = "0.1.0"}
 xdg = "2.2.0"
 
 flame = { version = "0.2", optional = true }
@@ -33,6 +33,7 @@ flamescope = { version = "0.1", optional = true }
 [target.'cfg(not(target_os = "redox"))'.dependencies]
 rustyline = "4.1.0"
 
+
 [dev-dependencies.cpython]
 version = "0.2"
 
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -10,10 +10,14 @@ edition = "2018"
 [lib]
 proc-macro = true
 
+[features]
+default = ["proc-macro-hack"]
+
 [dependencies]
 syn = { version = "0.15.29", features = ["full"] }
 quote = "0.6.11"
 proc-macro2 = "0.4.27"
 rustpython-compiler = { path = "../compiler", version = "0.1.0" }
 rustpython-bytecode = { path = "../bytecode", version = "0.1.0" }
 bincode =  "1.1"
+proc-macro-hack = { version = "0.5", optional = true }
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -50,7 +50,8 @@ pub fn pystruct_sequence(attr: TokenStream, item: TokenStream) -> TokenStream {
     result_to_tokens(pyclass::impl_pystruct_sequence(attr, item))
 }
 
-#[proc_macro]
+#[cfg_attr(feature = "proc-macro-hack", proc_macro_hack::proc_macro_hack)]
+#[cfg_attr(not(feature = "proc-macro-hack"), proc_macro)]
 pub fn py_compile_bytecode(input: TokenStream) -> TokenStream {
     result_to_tokens(compile_bytecode::impl_py_compile_bytecode(input.into()))
 }
diff --git a/src/main.rs b/src/main.rs
@@ -16,7 +16,6 @@ use rustpython_vm::{
     util, VirtualMachine,
 };
 
-use std::io::{self, BufRead, Write};
 use std::path::PathBuf;
 use std::process;
 
@@ -301,7 +300,7 @@ fn get_prompt(vm: &VirtualMachine, prompt_name: &str) -> String {
 #[cfg(not(target_os = "redox"))]
 fn run_shell(vm: &VirtualMachine) -> PyResult {
     use rustyline::{error::ReadlineError, Editor};
-    
+
     println!(
         "Welcome to the magnificent Rust Python {} interpreter \u{1f631} \u{1f596}",
         crate_version!()
@@ -376,12 +375,14 @@ fn run_shell(vm: &VirtualMachine) -> PyResult {
 
 #[cfg(target_os = "redox")]
 fn run_shell(vm: &VirtualMachine) -> PyResult {
-     println!(
+    use std::io::{self, BufRead, Write};
+
+    println!(
         "Welcome to the magnificent Rust Python {} interpreter \u{1f631} \u{1f596}",
         crate_version!()
     );
     let vars = vm.new_scope_with_builtins();
-    
+
     let stdin = io::stdin();
     let stdout = io::stdout();
     let mut stdout = stdout.lock();
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -9,9 +9,10 @@ edition = "2018"
 include = ["src/**/*.rs", "Cargo.toml", "build.rs", "Lib/**/*.py"]
 
 [features]
-default = ["rustpython-parser", "rustpython-compiler"]
+default = ["rustpython-parser", "rustpython-compiler", "use-proc-macro-hack"]
 vm-tracing-logging = []
 flame-it = ["flame", "flamer"]
+use-proc-macro-hack = ["proc-macro-hack", "rustpython-derive/proc-macro-hack"]
 
 [dependencies]
 # Crypto:
@@ -56,6 +57,7 @@ unicode_names2 = "0.2.2"
 unicode-casing = "0.1.0"
 unic = "0.9.0"
 maplit = "1.0"
+proc-macro-hack = { version = "0.5", optional = true }
 bitflags = "1.1"
 
 flame = { version = "0.2", optional = true }
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -13,8 +13,8 @@
 )]
 #![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/master/logo.png")]
 #![doc(html_root_url = "https://docs.rs/rustpython-vm/")]
-// For redox:
-#![feature(proc_macro_hygiene, vecdeque_rotate)]
+#![cfg_attr(not(feature = "use-proc-macro-hack"), feature(proc_macro_hygiene))]
+#![cfg_attr(target_os = "redox", feature(vecdeque_rotate))]
 
 #[cfg(feature = "flame-it")]
 #[macro_use]
@@ -38,6 +38,10 @@ extern crate self as rustpython_vm;
 
 pub use rustpython_derive::*;
 
+#[cfg(feature = "use-proc-macro-hack")]
+#[proc_macro_hack::proc_macro_hack]
+pub use rustpython_derive::py_compile_bytecode;
+
 //extern crate eval; use eval::eval::*;
 // use py_code_object::{Function, NativeType, PyCodeObject};
 
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -607,7 +607,6 @@ fn os_stat(
         .map_err(|s| vm.new_os_error(s.to_string()))
 }
 
-
 #[cfg(not(any(
     target_os = "linux",
     target_os = "macos",

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ pub fn pystruct_sequence(attr: TokenStream, item: TokenStream) -> TokenStream {`
`50`	`50`	`result_to_tokens(pyclass::impl_pystruct_sequence(attr, item))`
`51`	`51`	`}`
`52`	`52`
`53`		`-#[proc_macro]`
	`53`	`+#[cfg_attr(feature = "proc-macro-hack", proc_macro_hack::proc_macro_hack)]`
	`54`	`+#[cfg_attr(not(feature = "proc-macro-hack"), proc_macro)]`
`54`	`55`	`pub fn py_compile_bytecode(input: TokenStream) -> TokenStream {`
`55`	`56`	`result_to_tokens(compile_bytecode::impl_py_compile_bytecode(input.into()))`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,6 @@ fn os_stat(`
`607`	`607`	`.map_err(\|s\| vm.new_os_error(s.to_string()))`
`608`	`608`	`}`
`609`	`609`
`610`		`-`
`611`	`610`	`#[cfg(not(any(`
`612`	`611`	`target_os = "linux",`
`613`	`612`	`target_os = "macos",`