From 26ad8bd7625543d679cae6fbecaad7fe1a2d6d8f Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Wed, 12 Jul 2023 08:47:20 -0700 Subject: [PATCH] Revert back Cargo.toml/lock and remove `use regex::`. --- Cargo.lock | 12 ++++++------ clarity/Cargo.toml | 2 +- clarity/src/vm/costs/mod.rs | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ac95460fb..841302aee0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,9 +85,9 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -2121,9 +2121,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -2132,9 +2132,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "reqwest" diff --git a/clarity/Cargo.toml b/clarity/Cargo.toml index b268499ffe..b812ef735a 100644 --- a/clarity/Cargo.toml +++ b/clarity/Cargo.toml @@ -23,7 +23,7 @@ rand_chacha = "=0.2.2" serde = "1" serde_derive = "1" serde_stacker = "0.1" -regex = "~1.8" +regex = "1" lazy_static = "1.4.0" integer-sqrt = "0.1.3" slog = { version = "2.5.2", features = [ "max_level_trace" ] } diff --git a/clarity/src/vm/costs/mod.rs b/clarity/src/vm/costs/mod.rs index ee9a1a6eb2..c70ab9600a 100644 --- a/clarity/src/vm/costs/mod.rs +++ b/clarity/src/vm/costs/mod.rs @@ -18,7 +18,6 @@ use std::collections::{BTreeMap, HashMap}; use std::convert::{TryFrom, TryInto}; use std::{cmp, fmt}; -use regex::internal::Exec; use rusqlite::types::{FromSql, FromSqlResult, ToSql, ToSqlOutput, ValueRef}; use serde::{Deserialize, Serialize};