integrate sre_engine crate to workspace

youknowone · youknowone · commit 12601d0b44c7 · 2024-03-18T17:24:49.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 resolver = "2"
 members = [
     "compiler", "compiler/core", "compiler/codegen",
-    ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib", "derive-impl",
+    ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "wasm/lib", "derive-impl",
 ]
 
 [workspace.dependencies]
@@ -27,6 +27,7 @@ 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-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" }
@@ -64,7 +65,7 @@ malachite-base = "0.4.4"
 num-complex = "0.4.0"
 num-integer = "0.1.44"
 num-traits = "0.2"
-num_enum = "0.5.7"
+num_enum = "0.7"
 once_cell = "1.18"
 parking_lot = "0.12.1"
 paste = "1.0.7"
diff --git a/vm/sre_engine/Cargo.toml b/vm/sre_engine/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
-name = "sre-engine"
+name = "rustpython-sre_engine"
 version = "0.6.0"
 authors = ["Kangzhi Shi <shikangzhi@gmail.com>", "RustPython Team"]
 description = "A low-level implementation of Python's SRE regex engine"
-repository = "https://github.com/RustPython/sre-engine"
+repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
 edition = "2021"
 keywords = ["regex"]
 include = ["LICENSE", "src/**/*.rs"]
 
 [dependencies]
-num_enum = "0.7"
-bitflags = "2"
+num_enum = { workspace = true }
+bitflags = { workspace = true }
 optional = "0.5"
diff --git a/vm/sre_engine/tests/tests.rs b/vm/sre_engine/tests/tests.rs
@@ -1,4 +1,4 @@
-use sre_engine::{Request, State, StrDrive};
+use rustpython_sre_engine::{Request, State, StrDrive};
 
 struct Pattern {
     code: &'static [u32],

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use sre_engine::{Request, State, StrDrive};`
	`1`	`+use rustpython_sre_engine::{Request, State, StrDrive};`
`2`	`2`
`3`	`3`	`struct Pattern {`
`4`	`4`	`code: &'static [u32],`