diff --git a/_service b/_service index 820ebda..4b64973 100644 --- a/_service +++ b/_service @@ -4,5 +4,4 @@ native/Cargo.toml true - diff --git a/pyo3-022.patch b/pyo3-022.patch index 36ac1c5..819aebc 100644 --- a/pyo3-022.patch +++ b/pyo3-022.patch @@ -4,156 +4,31 @@ Date: Tue, 30 Jul 2024 15:34:55 +0000 Subject: [PATCH] Upgrade pyo3 to 0.22 --- - native/Cargo.lock | 57 +++++++------------------------ - native/libcst/Cargo.toml | 2 - - native/libcst/src/nodes/expression.rs | 13 +++---- - native/libcst/src/nodes/parser_config.rs | 2 - - native/libcst/src/nodes/traits.rs | 2 - - native/libcst/src/parser/errors.rs | 13 +++---- - native/libcst/src/py.rs | 2 - - native/libcst_derive/src/into_py.rs | 15 ++++---- - 8 files changed, 40 insertions(+), 66 deletions(-) + .cargo/config.toml | 8 +++++++- + native/libcst/Cargo.toml | 2 +- + native/libcst/src/nodes/expression.rs | 13 +++++++------ + native/libcst/src/nodes/parser_config.rs | 2 +- + native/libcst/src/nodes/traits.rs | 2 +- + native/libcst/src/parser/errors.rs | 13 +++++++------ + native/libcst/src/py.rs | 2 +- + native/libcst_derive/src/into_py.rs | 15 +++++++++------ + 8 files changed, 34 insertions(+), 23 deletions(-) ---- a/native/Cargo.lock -+++ b/native/Cargo.lock -@@ -36,12 +36,6 @@ source = "registry+https://github.com/ru - checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - - [[package]] --name = "bitflags" --version = "2.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -- --[[package]] - name = "bumpalo" - version = "3.16.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -229,9 +223,9 @@ checksum = "e5274423e17b7c9fc20b6e7e2085 - - [[package]] - name = "heck" --version = "0.4.1" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - - [[package]] - name = "hermit-abi" -@@ -333,16 +327,6 @@ dependencies = [ - ] - - [[package]] --name = "lock_api" --version = "0.4.12" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" --dependencies = [ -- "autocfg", -- "scopeguard", +--- a/.cargo/config.toml ++++ b/.cargo/config.toml +@@ -8,4 +8,10 @@ rustflags = [ + rustflags = [ + "-C", "link-arg=-undefined", + "-C", "link-arg=dynamic_lookup", -] -- --[[package]] - name = "log" - version = "0.4.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -485,15 +469,15 @@ dependencies = [ - - [[package]] - name = "pyo3" --version = "0.20.3" -+version = "0.22.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" -+checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" - dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset", -- "parking_lot", -+ "once_cell", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", -@@ -503,9 +487,9 @@ dependencies = [ - - [[package]] - name = "pyo3-build-config" --version = "0.20.3" -+version = "0.22.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" -+checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" - dependencies = [ - "once_cell", - "target-lexicon", -@@ -513,9 +497,9 @@ dependencies = [ - - [[package]] - name = "pyo3-ffi" --version = "0.20.3" -+version = "0.22.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" -+checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" - dependencies = [ - "libc", - "pyo3-build-config", -@@ -523,9 +507,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros" --version = "0.20.3" -+version = "0.22.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" -+checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" - dependencies = [ - "proc-macro2", - "pyo3-macros-backend", -@@ -535,9 +519,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros-backend" --version = "0.20.3" -+version = "0.22.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" -+checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" - dependencies = [ - "heck", - "proc-macro2", -@@ -576,15 +560,6 @@ dependencies = [ - ] - - [[package]] --name = "redox_syscall" --version = "0.5.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" --dependencies = [ -- "bitflags", --] -- --[[package]] - name = "regex" - version = "1.10.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -676,12 +651,6 @@ dependencies = [ - ] - - [[package]] --name = "smallvec" --version = "1.13.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -- --[[package]] - name = "syn" - version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" +\ No newline at end of file ++] ++ ++[source.crates-io] ++replace-with = "vendored-sources" ++ ++[source.vendored-sources] ++directory = "vendor" --- a/native/libcst/Cargo.toml +++ b/native/libcst/Cargo.toml @@ -36,7 +36,7 @@ trace = ["peg/trace"] diff --git a/vendor.tar.zst b/vendor.tar.zst index 34f4927..f09a60a 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d732efcdb2ae0dd9d040884dc5f29c22c02beaf302a5b1d9b5e27cf2c1dda69a -size 12316451 +oid sha256:0612f718a0d5f7c7f0a70c6151c9370d6c5d51f9074a11c8c3df5d7bf650b655 +size 30171484