From 8816cd41d5c0bbf8baaa14fcc9c3e5f8b0ca3863 Mon Sep 17 00:00:00 2001 From: Jeong YunWon Date: Tue, 9 Apr 2024 03:21:51 +0900 Subject: [PATCH] 0.3.1 --- Cargo.lock | 79 ++++++++++++++++++++++--------------- Cargo.toml | 42 ++++++++++---------- common/Cargo.toml | 2 +- compiler/Cargo.toml | 2 +- compiler/codegen/Cargo.toml | 2 +- compiler/core/Cargo.toml | 2 +- derive-impl/Cargo.toml | 2 +- derive/Cargo.toml | 2 +- jit/Cargo.toml | 4 +- pylib/Cargo.toml | 4 +- stdlib/Cargo.toml | 4 +- vm/Cargo.toml | 2 +- vm/src/exceptions.rs | 2 +- vm/sre_engine/Cargo.toml | 2 +- wapm.toml | 2 +- wasm/lib/Cargo.toml | 2 +- 16 files changed, 85 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4b01a0acf..01118ff8a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,6 +227,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" version = "0.4.37" @@ -525,12 +531,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1111,9 +1114,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libffi" @@ -1396,6 +1399,18 @@ dependencies = [ "memoffset 0.9.1", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "nom8" version = "0.2.0" @@ -1963,7 +1978,7 @@ dependencies = [ [[package]] name = "rustpython" -version = "0.3.0" +version = "0.3.1" dependencies = [ "atty", "cfg-if", @@ -1987,7 +2002,7 @@ dependencies = [ [[package]] name = "rustpython-ast" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=29c4728dbedc7e69cc2560b9b34058bbba9b1303#29c4728dbedc7e69cc2560b9b34058bbba9b1303" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "is-macro", "malachite-bigint", @@ -1998,7 +2013,7 @@ dependencies = [ [[package]] name = "rustpython-codegen" -version = "0.3.0" +version = "0.3.1" dependencies = [ "ahash", "bitflags 2.5.0", @@ -2016,7 +2031,7 @@ dependencies = [ [[package]] name = "rustpython-common" -version = "0.3.0" +version = "0.3.1" dependencies = [ "ascii", "bitflags 2.5.0", @@ -2042,7 +2057,7 @@ dependencies = [ [[package]] name = "rustpython-compiler" -version = "0.3.0" +version = "0.3.1" dependencies = [ "rustpython-codegen", "rustpython-compiler-core", @@ -2051,7 +2066,7 @@ dependencies = [ [[package]] name = "rustpython-compiler-core" -version = "0.3.0" +version = "0.3.1" dependencies = [ "bitflags 2.5.0", "itertools 0.11.0", @@ -2064,7 +2079,7 @@ dependencies = [ [[package]] name = "rustpython-derive" -version = "0.3.0" +version = "0.3.1" dependencies = [ "rustpython-compiler", "rustpython-derive-impl", @@ -2073,7 +2088,7 @@ dependencies = [ [[package]] name = "rustpython-derive-impl" -version = "0.3.0" +version = "0.3.1" dependencies = [ "itertools 0.11.0", "maplit", @@ -2099,7 +2114,7 @@ dependencies = [ [[package]] name = "rustpython-format" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=29c4728dbedc7e69cc2560b9b34058bbba9b1303#29c4728dbedc7e69cc2560b9b34058bbba9b1303" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "bitflags 2.5.0", "itertools 0.11.0", @@ -2110,7 +2125,7 @@ dependencies = [ [[package]] name = "rustpython-jit" -version = "0.3.0" +version = "0.3.1" dependencies = [ "approx", "cranelift", @@ -2126,7 +2141,7 @@ dependencies = [ [[package]] name = "rustpython-literal" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=29c4728dbedc7e69cc2560b9b34058bbba9b1303#29c4728dbedc7e69cc2560b9b34058bbba9b1303" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "hexf-parse", "is-macro", @@ -2138,7 +2153,7 @@ dependencies = [ [[package]] name = "rustpython-parser" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=29c4728dbedc7e69cc2560b9b34058bbba9b1303#29c4728dbedc7e69cc2560b9b34058bbba9b1303" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "anyhow", "is-macro", @@ -2161,7 +2176,7 @@ dependencies = [ [[package]] name = "rustpython-parser-core" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=29c4728dbedc7e69cc2560b9b34058bbba9b1303#29c4728dbedc7e69cc2560b9b34058bbba9b1303" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "is-macro", "memchr", @@ -2171,7 +2186,7 @@ dependencies = [ [[package]] name = "rustpython-parser-vendored" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=29c4728dbedc7e69cc2560b9b34058bbba9b1303#29c4728dbedc7e69cc2560b9b34058bbba9b1303" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "memchr", "once_cell", @@ -2179,7 +2194,7 @@ dependencies = [ [[package]] name = "rustpython-pylib" -version = "0.3.0" +version = "0.3.1" dependencies = [ "glob", "rustpython-compiler-core", @@ -2188,7 +2203,7 @@ dependencies = [ [[package]] name = "rustpython-sre_engine" -version = "0.6.0" +version = "0.3.1" dependencies = [ "bitflags 2.5.0", "num_enum", @@ -2197,7 +2212,7 @@ dependencies = [ [[package]] name = "rustpython-stdlib" -version = "0.3.0" +version = "0.3.1" dependencies = [ "adler32", "ahash", @@ -2269,7 +2284,7 @@ dependencies = [ [[package]] name = "rustpython-vm" -version = "0.3.0" +version = "0.3.1" dependencies = [ "ahash", "ascii", @@ -2345,7 +2360,7 @@ dependencies = [ [[package]] name = "rustpython_wasm" -version = "0.3.0" +version = "0.3.1" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2369,9 +2384,9 @@ checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rustyline" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" +checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ "bitflags 2.5.0", "cfg-if", @@ -2381,12 +2396,12 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.27.1", + "nix 0.28.0", "radix_trie", "unicode-segmentation", "unicode-width", "utf8parse", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3160,9 +3175,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" diff --git a/Cargo.toml b/Cargo.toml index 8b354c05a5..2255a827f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython" -version = "0.3.0" +version = "0.3.1" authors = ["RustPython Team"] edition = "2021" rust-version = "1.67.1" @@ -17,24 +17,24 @@ members = [ ] [workspace.dependencies] -rustpython-compiler-core = { path = "compiler/core", version = "0.3.0" } -rustpython-compiler = { path = "compiler", version = "0.3.0" } -rustpython-codegen = { path = "compiler/codegen", version = "0.3.0" } -rustpython-common = { path = "common", version = "0.3.0" } -rustpython-derive = { path = "derive", version = "0.3.0" } -rustpython-derive-impl = { path = "derive-impl", version = "0.3.0" } -rustpython-jit = { path = "jit", version = "0.3.0" } -rustpython-vm = { path = "vm", default-features = false, version = "0.3.0" } -rustpython-pylib = { path = "pylib", version = "0.3.0" } -rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.3.0" } -rustpython-sre_engine = { path = "vm/sre_engine", version = "0.6.0" } +rustpython-compiler-core = { path = "compiler/core", version = "0.3.1" } +rustpython-compiler = { path = "compiler", version = "0.3.1" } +rustpython-codegen = { path = "compiler/codegen", version = "0.3.1" } +rustpython-common = { path = "common", version = "0.3.1" } +rustpython-derive = { path = "derive", version = "0.3.1" } +rustpython-derive-impl = { path = "derive-impl", version = "0.3.1" } +rustpython-jit = { path = "jit", version = "0.3.1" } +rustpython-vm = { path = "vm", default-features = false, version = "0.3.1" } +rustpython-pylib = { path = "pylib", version = "0.3.1" } +rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.3.1" } +rustpython-sre_engine = { path = "vm/sre_engine", version = "0.3.1" } rustpython-doc = { git = "https://github.com/RustPython/__doc__", tag = "0.3.0", version = "0.3.0" } -rustpython-literal = { git = "https://github.com/RustPython/Parser.git", rev = "29c4728dbedc7e69cc2560b9b34058bbba9b1303" } -rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", rev = "29c4728dbedc7e69cc2560b9b34058bbba9b1303" } -rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "29c4728dbedc7e69cc2560b9b34058bbba9b1303" } -rustpython-ast = { git = "https://github.com/RustPython/Parser.git", rev = "29c4728dbedc7e69cc2560b9b34058bbba9b1303" } -rustpython-format = { git = "https://github.com/RustPython/Parser.git", rev = "29c4728dbedc7e69cc2560b9b34058bbba9b1303" } +rustpython-literal = { git = "https://github.com/RustPython/Parser.git", version = "0.3.1", rev = "a95045bc627b2fbf84caf4f010e521846be7b37f" } +rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", version = "0.3.1", rev = "a95045bc627b2fbf84caf4f010e521846be7b37f" } +rustpython-parser = { git = "https://github.com/RustPython/Parser.git", version = "0.3.1", rev = "a95045bc627b2fbf84caf4f010e521846be7b37f" } +rustpython-ast = { git = "https://github.com/RustPython/Parser.git", version = "0.3.1", rev = "a95045bc627b2fbf84caf4f010e521846be7b37f" } +rustpython-format = { git = "https://github.com/RustPython/Parser.git", version = "0.3.1", rev = "a95045bc627b2fbf84caf4f010e521846be7b37f" } # rustpython-literal = { path = "../RustPython-parser/literal" } # rustpython-parser-core = { path = "../RustPython-parser/core" } # rustpython-parser = { path = "../RustPython-parser/parser" } @@ -48,7 +48,7 @@ bitflags = "2.4.1" bstr = "0.2.17" cfg-if = "1.0" chrono = "0.4.37" -crossbeam-utils = "0.8.16" +crossbeam-utils = "0.8.19" flame = "0.2.2" glob = "0.3" hex = "0.4.3" @@ -56,7 +56,7 @@ indexmap = { version = "2.2.6", features = ["std"] } insta = "1.38.0" itertools = "0.11.0" is-macro = "0.3.0" -libc = "0.2.151" +libc = "0.2.153" log = "0.4.16" nix = { version = "0.27", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] } malachite-bigint = "0.2.0" @@ -71,7 +71,7 @@ once_cell = "1.19.0" parking_lot = "0.12.1" paste = "1.0.7" rand = "0.8.5" -rustyline = "13" +rustyline = "14.0.0" serde = { version = "1.0.133", default-features = false } schannel = "0.1.22" static_assertions = "1.1" @@ -79,7 +79,7 @@ syn = "1.0.109" thiserror = "1.0" thread_local = "1.1.4" unicode_names2 = "1.1.0" -widestring = "0.5.1" +widestring = "1.1.0" [features] default = ["threading", "stdlib", "zlib", "importlib"] diff --git a/common/Cargo.toml b/common/Cargo.toml index 397897f491..2d5ba72ec6 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-common" -version = "0.3.0" +version = "0.3.1" description = "General python functions and algorithms for use in RustPython" authors = ["RustPython Team"] edition = "2021" diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 8dec426b2b..bc28b774d2 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-compiler" -version = "0.3.0" +version = "0.3.1" description = "A usability wrapper around rustpython-parser and rustpython-compiler-core" authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" diff --git a/compiler/codegen/Cargo.toml b/compiler/codegen/Cargo.toml index 8cfd485b82..9b68abaafa 100644 --- a/compiler/codegen/Cargo.toml +++ b/compiler/codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-codegen" -version = "0.3.0" +version = "0.3.1" description = "Compiler for python code into bytecode for the rustpython VM." authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" diff --git a/compiler/core/Cargo.toml b/compiler/core/Cargo.toml index 12413b7b9e..7db471bf22 100644 --- a/compiler/core/Cargo.toml +++ b/compiler/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustpython-compiler-core" description = "RustPython specific bytecode." -version = "0.3.0" +version = "0.3.1" authors = ["RustPython Team"] edition = "2021" repository = "https://github.com/RustPython/RustPython" diff --git a/derive-impl/Cargo.toml b/derive-impl/Cargo.toml index 7f55078d5f..dc2e859d77 100644 --- a/derive-impl/Cargo.toml +++ b/derive-impl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-derive-impl" -version = "0.3.0" +version = "0.3.1" description = "Rust language extensions and macros specific to rustpython." authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 5010877a6c..a945be073a 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-derive" -version = "0.3.0" +version = "0.3.1" description = "Rust language extensions and macros specific to rustpython." authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" diff --git a/jit/Cargo.toml b/jit/Cargo.toml index 71f8822cc9..f628e4b560 100644 --- a/jit/Cargo.toml +++ b/jit/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-jit" -version = "0.3.0" +version = "0.3.1" description = "Experimental JIT(just in time) compiler for python code." authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" @@ -21,7 +21,7 @@ cranelift-module = "0.88.0" libffi = "3.1.0" [dev-dependencies] -rustpython-derive = { path = "../derive", version = "0.3.0" } +rustpython-derive = { path = "../derive", version = "0.3.1" } approx = "0.5.1" diff --git a/pylib/Cargo.toml b/pylib/Cargo.toml index 256dbe9d61..21daaee59b 100644 --- a/pylib/Cargo.toml +++ b/pylib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-pylib" -version = "0.3.0" +version = "0.3.1" authors = ["RustPython Team"] description = "A subset of the Python standard library for use with RustPython" repository = "https://github.com/RustPython/RustPython" @@ -13,7 +13,7 @@ freeze-stdlib = [] [dependencies] rustpython-compiler-core = { workspace = true } -rustpython-derive = { version = "0.3.0", path = "../derive" } +rustpython-derive = { version = "0.3.1", path = "../derive" } [build-dependencies] glob = { workspace = true } diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index 7f89636b33..e7b983f422 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-stdlib" -version = "0.3.0" +version = "0.3.1" description = "RustPython standard libraries in Rust." authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" @@ -19,7 +19,7 @@ ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"] [dependencies] # rustpython crates rustpython-derive = { workspace = true } -rustpython-vm = { workspace = true } +rustpython-vm = { workspace = true, features = ["compiler"] } rustpython-common = { workspace = true } ahash = { workspace = true } diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 98c2e2b834..f9061ba0b0 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-vm" -version = "0.3.0" +version = "0.3.1" description = "RustPython virtual machine." authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs index d83e7e48d8..b41c902e49 100644 --- a/vm/src/exceptions.rs +++ b/vm/src/exceptions.rs @@ -1006,7 +1006,7 @@ impl ToPyException for std::ffi::NulError { } #[cfg(windows)] -impl ToPyException for widestring::NulError { +impl ToPyException for widestring::error::ContainsNul { fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { cstring_error(vm) } diff --git a/vm/sre_engine/Cargo.toml b/vm/sre_engine/Cargo.toml index 2caa8b73e5..a628744428 100644 --- a/vm/sre_engine/Cargo.toml +++ b/vm/sre_engine/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython-sre_engine" -version = "0.6.0" +version = "0.3.1" authors = ["Kangzhi Shi ", "RustPython Team"] description = "A low-level implementation of Python's SRE regex engine" repository = "https://github.com/RustPython/RustPython" diff --git a/wapm.toml b/wapm.toml index 98bf96bed1..13f10f1558 100644 --- a/wapm.toml +++ b/wapm.toml @@ -1,6 +1,6 @@ [package] name = "rustpython" -version = "0.3.0" +version = "0.3.1" description = "A Python-3 (CPython >= 3.5.0) Interpreter written in Rust 🐍 😱 🤘" license-file = "LICENSE" readme = "README.md" diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml index 309607e70f..f7f736401a 100644 --- a/wasm/lib/Cargo.toml +++ b/wasm/lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustpython_wasm" -version = "0.3.0" +version = "0.3.1" authors = ["RustPython Team"] license = "MIT" description = "A Python-3 (CPython >= 3.5.0) Interpreter written in Rust, compiled to WASM"