2 Commits

Author SHA1 Message Date
Luke Parker
974bc82387 Remove unnecessary to_string for clone 2025-09-03 06:11:32 -04:00
Luke Parker
47ef24a7cc Remove unused patch for parking_lot_core 2025-09-03 06:11:32 -04:00
8 changed files with 7 additions and 34 deletions

13
Cargo.lock generated
View File

@@ -2515,7 +2515,7 @@ dependencies = [
"hashbrown 0.14.5", "hashbrown 0.14.5",
"lock_api", "lock_api",
"once_cell", "once_cell",
"parking_lot_core 0.9.11", "parking_lot_core",
] ]
[[package]] [[package]]
@@ -6993,14 +6993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
dependencies = [ dependencies = [
"lock_api", "lock_api",
"parking_lot_core 0.9.11", "parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.8.6"
dependencies = [
"parking_lot_core 0.9.11",
] ]
[[package]] [[package]]
@@ -11835,7 +11828,7 @@ dependencies = [
"cfg_aliases 0.2.1", "cfg_aliases 0.2.1",
"libc", "libc",
"parking_lot 0.12.4", "parking_lot 0.12.4",
"parking_lot_core 0.9.11", "parking_lot_core",
"static_init_macro", "static_init_macro",
"winapi", "winapi",
] ]

View File

@@ -2,7 +2,6 @@
resolver = "2" resolver = "2"
members = [ members = [
# Version patches # Version patches
"patches/parking_lot_core",
"patches/parking_lot", "patches/parking_lot",
"patches/zstd", "patches/zstd",
"patches/rocksdb", "patches/rocksdb",
@@ -204,7 +203,6 @@ modular-frost = { path = "crypto/frost" }
# https://github.com/rust-lang-nursery/lazy-static.rs/issues/201 # https://github.com/rust-lang-nursery/lazy-static.rs/issues/201
lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" } lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" }
parking_lot_core = { path = "patches/parking_lot_core" }
parking_lot = { path = "patches/parking_lot" } parking_lot = { path = "patches/parking_lot" }
# wasmtime pulls in an old version for this # wasmtime pulls in an old version for this
zstd = { path = "patches/zstd" } zstd = { path = "patches/zstd" }

View File

@@ -1,4 +1,4 @@
fn main() { fn main() {
let artifacts_path = std::env::var("OUT_DIR").unwrap().to_string() + "/ethereum-schnorr-contract"; let artifacts_path = std::env::var("OUT_DIR").unwrap().clone() + "/ethereum-schnorr-contract";
build_solidity_contracts::build(&[], "contracts", &artifacts_path).unwrap(); build_solidity_contracts::build(&[], "contracts", &artifacts_path).unwrap();
} }

View File

@@ -1,16 +0,0 @@
[package]
name = "parking_lot_core"
version = "0.8.6"
description = "parking_lot_core which patches to the latest update"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/patches/parking_lot_core"
authors = ["Luke Parker <lukeparker5132@gmail.com>"]
keywords = []
edition = "2021"
[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
parking_lot_core = "0.9"

View File

@@ -1 +0,0 @@
pub use parking_lot_core::*;

View File

@@ -1,5 +1,5 @@
fn main() { fn main() {
let artifacts_path = let artifacts_path =
std::env::var("OUT_DIR").unwrap().to_string() + "/serai-processor-ethereum-deployer"; std::env::var("OUT_DIR").unwrap().clone() + "/serai-processor-ethereum-deployer";
build_solidity_contracts::build(&[], "contracts", &artifacts_path).unwrap(); build_solidity_contracts::build(&[], "contracts", &artifacts_path).unwrap();
} }

View File

@@ -19,8 +19,7 @@ fn sol(sol_files: &[&str], file: &str) {
} }
fn main() { fn main() {
let artifacts_path = let artifacts_path = env::var("OUT_DIR").unwrap().clone() + "/serai-processor-ethereum-router";
env::var("OUT_DIR").unwrap().to_string() + "/serai-processor-ethereum-router";
if !fs::exists(&artifacts_path).unwrap() { if !fs::exists(&artifacts_path).unwrap() {
fs::create_dir(&artifacts_path).unwrap(); fs::create_dir(&artifacts_path).unwrap();

View File

@@ -87,7 +87,7 @@ async fn main() {
TransactionPublisher::new(db, provider, { TransactionPublisher::new(db, provider, {
let relayer_hostname = env::var("ETHEREUM_RELAYER_HOSTNAME") let relayer_hostname = env::var("ETHEREUM_RELAYER_HOSTNAME")
.expect("ethereum relayer hostname wasn't specified") .expect("ethereum relayer hostname wasn't specified")
.to_string(); .clone();
let relayer_port = let relayer_port =
env::var("ETHEREUM_RELAYER_PORT").expect("ethereum relayer port wasn't specified"); env::var("ETHEREUM_RELAYER_PORT").expect("ethereum relayer port wasn't specified");
relayer_hostname + ":" + &relayer_port relayer_hostname + ":" + &relayer_port