From bfaa1f9530f8dfa7116fd5a3d0a9aaae6de50703 Mon Sep 17 00:00:00 2001
From: Zanie <contact@zanie.dev>
Date: Mon, 17 Jul 2023 17:52:06 -0500
Subject: [PATCH] Bump RustPython-Parser to include PEP-695

https://github.com/astral-sh/RustPython-Parser/commit/126652b684910c29a7bcc32293d4ca0f81454e34
---
 Cargo.lock | 24 ++++++++++++++++++++++++
 Cargo.toml | 12 ++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 73f39a2782..9b8f7422ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2134,7 +2134,11 @@ dependencies = [
 [[package]]
 name = "ruff_text_size"
 version = "0.0.0"
+<<<<<<< HEAD
 source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=b996b21ffca562ecb2086f632a6a0b05c245c24a#b996b21ffca562ecb2086f632a6a0b05c245c24a"
+=======
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=126652b684910c29a7bcc32293d4ca0f81454e34#126652b684910c29a7bcc32293d4ca0f81454e34"
+>>>>>>> 86957a9a9 (Bump RustPython-Parser to include PEP-695)
 dependencies = [
  "schemars",
  "serde",
@@ -2245,7 +2249,11 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
+<<<<<<< HEAD
 source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=b996b21ffca562ecb2086f632a6a0b05c245c24a#b996b21ffca562ecb2086f632a6a0b05c245c24a"
+=======
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=126652b684910c29a7bcc32293d4ca0f81454e34#126652b684910c29a7bcc32293d4ca0f81454e34"
+>>>>>>> 86957a9a9 (Bump RustPython-Parser to include PEP-695)
 dependencies = [
  "is-macro",
  "num-bigint",
@@ -2256,7 +2264,11 @@ dependencies = [
 [[package]]
 name = "rustpython-format"
 version = "0.2.0"
+<<<<<<< HEAD
 source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=b996b21ffca562ecb2086f632a6a0b05c245c24a#b996b21ffca562ecb2086f632a6a0b05c245c24a"
+=======
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=126652b684910c29a7bcc32293d4ca0f81454e34#126652b684910c29a7bcc32293d4ca0f81454e34"
+>>>>>>> 86957a9a9 (Bump RustPython-Parser to include PEP-695)
 dependencies = [
  "bitflags 2.3.3",
  "itertools",
@@ -2268,7 +2280,11 @@ dependencies = [
 [[package]]
 name = "rustpython-literal"
 version = "0.2.0"
+<<<<<<< HEAD
 source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=b996b21ffca562ecb2086f632a6a0b05c245c24a#b996b21ffca562ecb2086f632a6a0b05c245c24a"
+=======
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=126652b684910c29a7bcc32293d4ca0f81454e34#126652b684910c29a7bcc32293d4ca0f81454e34"
+>>>>>>> 86957a9a9 (Bump RustPython-Parser to include PEP-695)
 dependencies = [
  "hexf-parse",
  "is-macro",
@@ -2280,7 +2296,11 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
+<<<<<<< HEAD
 source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=b996b21ffca562ecb2086f632a6a0b05c245c24a#b996b21ffca562ecb2086f632a6a0b05c245c24a"
+=======
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=126652b684910c29a7bcc32293d4ca0f81454e34#126652b684910c29a7bcc32293d4ca0f81454e34"
+>>>>>>> 86957a9a9 (Bump RustPython-Parser to include PEP-695)
 dependencies = [
  "anyhow",
  "is-macro",
@@ -2303,7 +2323,11 @@ dependencies = [
 [[package]]
 name = "rustpython-parser-core"
 version = "0.2.0"
+<<<<<<< HEAD
 source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=b996b21ffca562ecb2086f632a6a0b05c245c24a#b996b21ffca562ecb2086f632a6a0b05c245c24a"
+=======
+source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=126652b684910c29a7bcc32293d4ca0f81454e34#126652b684910c29a7bcc32293d4ca0f81454e34"
+>>>>>>> 86957a9a9 (Bump RustPython-Parser to include PEP-695)
 dependencies = [
  "is-macro",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 04360b6360..d9dd4d712c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,12 +54,12 @@ libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f
 
 # Please tag the RustPython version every time 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.
-# Current tag: v0.0.7
-ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a" }
-rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a" , default-features = false, features = ["num-bigint"]}
-rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a", default-features = false, features = ["num-bigint"] }
-rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a", default-features = false }
-rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "b996b21ffca562ecb2086f632a6a0b05c245c24a" , default-features = false, features = ["full-lexer", "num-bigint"] }
+# Note: As of tag v0.0.8 we are cherry-picking commits instead of rebasing so the tag is not necessary
+ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34" }
+rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34" , default-features = false, features = ["num-bigint"]}
+rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34", default-features = false, features = ["num-bigint"] }
+rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34", default-features = false }
+rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34" , default-features = false, features = ["full-lexer", "num-bigint"] }
 
 [profile.release]
 lto = "fat"