about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRémy Rakic <remy.rakic+github@gmail.com>2024-04-14 16:36:09 +0000
committerRémy Rakic <remy.rakic+github@gmail.com>2024-04-15 17:23:16 +0000
commit682535e7775efb2f2e4934b2cf5bc5edc3253968 (patch)
tree349a1cc46533c8317ec10c9f3f94007fa253f6e2
parent96e7d25891fbac3fb693a6c041b93a98712aba15 (diff)
downloadrust-682535e7775efb2f2e4934b2cf5bc5edc3253968.tar.gz
rust-682535e7775efb2f2e4934b2cf5bc5edc3253968.zip
add regex to run_make_support
note: version more recent than 1.8 depend on memchr 2.6, which creates
conflicts as memchr 2.5.0 is pinned elsewhere in the workspace
-rw-r--r--Cargo.lock1
-rw-r--r--src/tools/run-make-support/Cargo.toml1
-rw-r--r--src/tools/run-make-support/src/lib.rs1
3 files changed, 3 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1f26dd7c43c..faf2c473ee1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3342,6 +3342,7 @@ name = "run_make_support"
 version = "0.0.0"
 dependencies = [
  "object 0.34.0",
+ "regex",
  "wasmparser",
 ]
 
diff --git a/src/tools/run-make-support/Cargo.toml b/src/tools/run-make-support/Cargo.toml
index d8bb8c643d1..3ea35c7940c 100644
--- a/src/tools/run-make-support/Cargo.toml
+++ b/src/tools/run-make-support/Cargo.toml
@@ -6,3 +6,4 @@ edition = "2021"
 [dependencies]
 object = "0.34.0"
 wasmparser = "0.118.2"
+regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
index 47b46a0a699..9a4fdff5d15 100644
--- a/src/tools/run-make-support/src/lib.rs
+++ b/src/tools/run-make-support/src/lib.rs
@@ -13,6 +13,7 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Output};
 
 pub use object;
+pub use regex;
 pub use wasmparser;
 
 pub use cc::{cc, extra_c_flags, extra_cxx_flags, Cc};