From 072358e26b9812239e70ca3b183fb9c3d2f519d2 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Fri, 7 Jul 2023 10:00:44 -0400 Subject: [PATCH] Use Instagram's LibCST rather than our fork (#5593) ## Summary Historically, we only used a fork to enable building without pyo3. But pyo3 is an optional feature. I may've just not understood how to accomplish this way back when. --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2376d4aab3..bc1fa2a60b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1137,7 +1137,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libcst" version = "0.1.0" -source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438" +source = "git+https://github.com/Instagram/LibCST.git?rev=3cacca1a1029f05707e50703b49fe3dd860aa839#3cacca1a1029f05707e50703b49fe3dd860aa839" dependencies = [ "chic", "itertools", @@ -1152,7 +1152,7 @@ dependencies = [ [[package]] name = "libcst_derive" version = "0.1.0" -source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438" +source = "git+https://github.com/Instagram/LibCST.git?rev=3cacca1a1029f05707e50703b49fe3dd860aa839#3cacca1a1029f05707e50703b49fe3dd860aa839" dependencies = [ "quote", "syn 1.0.109", diff --git a/Cargo.toml b/Cargo.toml index 1ca004af7b..de63ac83b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,8 +48,8 @@ test-case = { version = "3.0.0" } thiserror = { version = "1.0.43" } toml = { version = "0.7.2" } -# v0.0.1 -libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" } +# v1.0.1 +libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false } # Please tag the RustPython version everytime you update its revision here and in fuzz/Cargo.toml # Tagging the version ensures that older ruff versions continue to build from source even when we rebase our RustPython fork.