Content-Length: 13255 | pFad | http://github.com/RustPython/RustPython/pull/5691.patch

thub.com From 085ae6290ec6977155acf5a433ad360d6d838f5f Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Fri, 11 Apr 2025 11:02:20 +0200 Subject: [PATCH 1/8] add disable-console --- Cargo.toml | 1 + vm/Cargo.toml | 1 + vm/src/vm/mod.rs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 14e66b39eb..19304166f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ bz2 = ["stdlib", "rustpython-stdlib/bz2"] sqlite = ["rustpython-stdlib/sqlite"] ssl = ["rustpython-stdlib/ssl"] ssl-vendor = ["ssl", "rustpython-stdlib/ssl-vendor"] +disable_console = ["rustpython-vm/disable-console"] [dependencies] rustpython-compiler = { workspace = true } diff --git a/vm/Cargo.toml b/vm/Cargo.toml index a0e357baa9..44fc1e54c3 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -24,6 +24,7 @@ codegen = ["rustpython-codegen", "ast"] parser = ["rustpython-parser", "ast"] serde = ["dep:serde"] wasmbind = ["chrono/wasmbind", "getrandom/wasm_js", "wasm-bindgen"] +disable-console = [] [dependencies] rustpython-compiler = { workspace = true, optional = true } diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs index dd647e36f8..4fbdc862d5 100644 --- a/vm/src/vm/mod.rs +++ b/vm/src/vm/mod.rs @@ -296,7 +296,7 @@ impl VirtualMachine { let importlib = import::init_importlib_base(self)?; self.import_utf8_encodings()?; - #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] + #[cfg(all(any(not(target_arch = "wasm32"), target_os = "wasi"), not(feature = "disable-console")))] { let io = import::import_builtin(self, "_io")?; let set_stdio = |name, fd, write| { From b0eb868a5351b8bc1e9365df772c096a40bd01e8 Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Fri, 11 Apr 2025 11:12:28 +0200 Subject: [PATCH 2/8] fixed typo --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 19304166f0..3dcc4d8af6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ bz2 = ["stdlib", "rustpython-stdlib/bz2"] sqlite = ["rustpython-stdlib/sqlite"] ssl = ["rustpython-stdlib/ssl"] ssl-vendor = ["ssl", "rustpython-stdlib/ssl-vendor"] -disable_console = ["rustpython-vm/disable-console"] +disable-console = ["rustpython-vm/disable-console"] [dependencies] rustpython-compiler = { workspace = true } From cfe986cd558ecbb521985ca3729d5ed9c126ec21 Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Fri, 11 Apr 2025 11:20:30 +0200 Subject: [PATCH 3/8] move to avoid conflicts --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3dcc4d8af6..b7226ee908 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,7 @@ license.workspace = true default = ["threading", "stdlib", "importlib"] importlib = ["rustpython-vm/importlib"] encodings = ["rustpython-vm/encodings"] +disable-console = ["rustpython-vm/disable-console"] stdlib = ["rustpython-stdlib", "rustpython-pylib", "encodings"] flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"] freeze-stdlib = ["stdlib", "rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"] @@ -22,7 +23,6 @@ bz2 = ["stdlib", "rustpython-stdlib/bz2"] sqlite = ["rustpython-stdlib/sqlite"] ssl = ["rustpython-stdlib/ssl"] ssl-vendor = ["ssl", "rustpython-stdlib/ssl-vendor"] -disable-console = ["rustpython-vm/disable-console"] [dependencies] rustpython-compiler = { workspace = true } From b26d996d9b5b849d3a64f9efa0d1fbfd2ac22b38 Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Fri, 11 Apr 2025 11:39:17 +0200 Subject: [PATCH 4/8] reaname to disable-stderr and change scope --- Cargo.toml | 2 +- vm/Cargo.toml | 2 +- vm/src/vm/mod.rs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b7226ee908..0d35dc360f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true default = ["threading", "stdlib", "importlib"] importlib = ["rustpython-vm/importlib"] encodings = ["rustpython-vm/encodings"] -disable-console = ["rustpython-vm/disable-console"] +disable-stderr = ["rustpython-vm/disable-stderr"] stdlib = ["rustpython-stdlib", "rustpython-pylib", "encodings"] flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"] freeze-stdlib = ["stdlib", "rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 44fc1e54c3..a2d111dc39 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -24,7 +24,7 @@ codegen = ["rustpython-codegen", "ast"] parser = ["rustpython-parser", "ast"] serde = ["dep:serde"] wasmbind = ["chrono/wasmbind", "getrandom/wasm_js", "wasm-bindgen"] -disable-console = [] +disable-stderr = [] [dependencies] rustpython-compiler = { workspace = true, optional = true } diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs index 4fbdc862d5..cbbd69950a 100644 --- a/vm/src/vm/mod.rs +++ b/vm/src/vm/mod.rs @@ -296,7 +296,7 @@ impl VirtualMachine { let importlib = import::init_importlib_base(self)?; self.import_utf8_encodings()?; - #[cfg(all(any(not(target_arch = "wasm32"), target_os = "wasi"), not(feature = "disable-console")))] + #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] { let io = import::import_builtin(self, "_io")?; let set_stdio = |name, fd, write| { @@ -342,6 +342,7 @@ impl VirtualMachine { }; set_stdio("stdin", 0, false)?; set_stdio("stdout", 1, true)?; + #[cfg(not(feature = "disable-stderr"))] set_stdio("stderr", 2, true)?; let io_open = io.get_attr("open", self)?; From ad164eb9f3fa43dcbd69fc6b6b321165e02e290c Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Fri, 11 Apr 2025 12:12:57 +0200 Subject: [PATCH 5/8] also disable stdin --- Cargo.toml | 2 +- vm/Cargo.toml | 2 +- vm/src/vm/mod.rs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0d35dc360f..4a271ac6ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true default = ["threading", "stdlib", "importlib"] importlib = ["rustpython-vm/importlib"] encodings = ["rustpython-vm/encodings"] -disable-stderr = ["rustpython-vm/disable-stderr"] +disable-stdin-stderr = ["rustpython-vm/disable-stdin-stderr"] stdlib = ["rustpython-stdlib", "rustpython-pylib", "encodings"] flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"] freeze-stdlib = ["stdlib", "rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index a2d111dc39..4b0cbdaf3b 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -24,7 +24,7 @@ codegen = ["rustpython-codegen", "ast"] parser = ["rustpython-parser", "ast"] serde = ["dep:serde"] wasmbind = ["chrono/wasmbind", "getrandom/wasm_js", "wasm-bindgen"] -disable-stderr = [] +disable-stdin-stderr = [] [dependencies] rustpython-compiler = { workspace = true, optional = true } diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs index cbbd69950a..0d84373953 100644 --- a/vm/src/vm/mod.rs +++ b/vm/src/vm/mod.rs @@ -340,9 +340,10 @@ impl VirtualMachine { self.sys_module.set_attr(name, stdio, self)?; Ok(()) }; + #[cfg(not(feature = "disable-stdin-stderr"))] set_stdio("stdin", 0, false)?; set_stdio("stdout", 1, true)?; - #[cfg(not(feature = "disable-stderr"))] + #[cfg(not(feature = "disable-stdin-stderr"))] set_stdio("stderr", 2, true)?; let io_open = io.get_attr("open", self)?; From 9191e8eac3b57a862ab25a875cb7e1bf6ede5efc Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Fri, 11 Apr 2025 12:20:53 +0200 Subject: [PATCH 6/8] rename to disable-stdio --- Cargo.toml | 2 +- vm/Cargo.toml | 2 +- vm/src/vm/mod.rs | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4a271ac6ba..5f39228348 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true default = ["threading", "stdlib", "importlib"] importlib = ["rustpython-vm/importlib"] encodings = ["rustpython-vm/encodings"] -disable-stdin-stderr = ["rustpython-vm/disable-stdin-stderr"] +disable-stdio = ["rustpython-vm/disable-stdio"] stdlib = ["rustpython-stdlib", "rustpython-pylib", "encodings"] flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"] freeze-stdlib = ["stdlib", "rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 4b0cbdaf3b..7225d3c3ac 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -24,7 +24,7 @@ codegen = ["rustpython-codegen", "ast"] parser = ["rustpython-parser", "ast"] serde = ["dep:serde"] wasmbind = ["chrono/wasmbind", "getrandom/wasm_js", "wasm-bindgen"] -disable-stdin-stderr = [] +disable-stdio = [] [dependencies] rustpython-compiler = { workspace = true, optional = true } diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs index 0d84373953..f5ac9bf1ed 100644 --- a/vm/src/vm/mod.rs +++ b/vm/src/vm/mod.rs @@ -296,7 +296,10 @@ impl VirtualMachine { let importlib = import::init_importlib_base(self)?; self.import_utf8_encodings()?; - #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] + #[cfg( + all(any(not(target_arch = "wasm32"), target_os = "wasi")), + not(feature = "disable-stdio") + )] { let io = import::import_builtin(self, "_io")?; let set_stdio = |name, fd, write| { @@ -340,10 +343,8 @@ impl VirtualMachine { self.sys_module.set_attr(name, stdio, self)?; Ok(()) }; - #[cfg(not(feature = "disable-stdin-stderr"))] set_stdio("stdin", 0, false)?; set_stdio("stdout", 1, true)?; - #[cfg(not(feature = "disable-stdin-stderr"))] set_stdio("stderr", 2, true)?; let io_open = io.get_attr("open", self)?; From 0e11f927c93b6fc80a0c272d9ada61fad322934e Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Fri, 11 Apr 2025 12:26:59 +0200 Subject: [PATCH 7/8] fix bracked --- vm/src/vm/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs index f5ac9bf1ed..184e4f8817 100644 --- a/vm/src/vm/mod.rs +++ b/vm/src/vm/mod.rs @@ -296,10 +296,10 @@ impl VirtualMachine { let importlib = import::init_importlib_base(self)?; self.import_utf8_encodings()?; - #[cfg( - all(any(not(target_arch = "wasm32"), target_os = "wasi")), + #[cfg(all( + any(not(target_arch = "wasm32"), target_os = "wasi"), not(feature = "disable-stdio") - )] + ))] { let io = import::import_builtin(self, "_io")?; let set_stdio = |name, fd, write| { From 9706f16407c3f439206c043c0542ae6073017d38 Mon Sep 17 00:00:00 2001 From: Marco Mengelkoch Date: Sat, 12 Apr 2025 23:26:33 +0200 Subject: [PATCH 8/8] rename to quiet-stdio --- Cargo.toml | 2 +- vm/Cargo.toml | 2 +- vm/src/vm/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5f39228348..f52745c6e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true default = ["threading", "stdlib", "importlib"] importlib = ["rustpython-vm/importlib"] encodings = ["rustpython-vm/encodings"] -disable-stdio = ["rustpython-vm/disable-stdio"] +quiet-stdio = ["rustpython-vm/quiet-stdio"] stdlib = ["rustpython-stdlib", "rustpython-pylib", "encodings"] flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"] freeze-stdlib = ["stdlib", "rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 7225d3c3ac..6321155f43 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -24,7 +24,7 @@ codegen = ["rustpython-codegen", "ast"] parser = ["rustpython-parser", "ast"] serde = ["dep:serde"] wasmbind = ["chrono/wasmbind", "getrandom/wasm_js", "wasm-bindgen"] -disable-stdio = [] +quiet-stdio = [] [dependencies] rustpython-compiler = { workspace = true, optional = true } diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs index 184e4f8817..7c817056c6 100644 --- a/vm/src/vm/mod.rs +++ b/vm/src/vm/mod.rs @@ -298,7 +298,7 @@ impl VirtualMachine { #[cfg(all( any(not(target_arch = "wasm32"), target_os = "wasi"), - not(feature = "disable-stdio") + not(feature = "quiet-stdio") ))] { let io = import::import_builtin(self, "_io")?;

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!