diff --git a/Cargo.lock b/Cargo.lock index bde3e61e05d..2c36b590482 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -429,7 +429,7 @@ dependencies = [ "num-traits", "num_enum", "oneshot", - "paste", + "pastey", "portable-atomic", "rand", "regress", @@ -507,7 +507,7 @@ dependencies = [ "icu_segmenter", "icu_time", "once_cell", - "paste", + "pastey", ] [[package]] @@ -596,7 +596,7 @@ version = "1.0.0-dev" dependencies = [ "fast-float2", "itoa", - "paste", + "pastey", "rustc-hash 2.1.2", "ryu-js", "static_assertions", @@ -2892,10 +2892,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "052ff849639942444955d93311f17caa86c9d77164a3dfc3b477b066246a5a79" [[package]] -name = "paste" -version = "1.0.15" +name = "pastey" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "b867cad97c0791bbd3aaa6472142568c6c9e8f71937e98379f584cfb0cf35bec" [[package]] name = "percent-encoding" diff --git a/Cargo.toml b/Cargo.toml index 7ac0d329d56..e40b7434479 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -112,7 +112,7 @@ syn = { version = "2.0.116", default-features = false } proc-macro2 = "1.0" synstructure = "0.13" measureme = "12.0.3" -paste = "1.0" +pastey = "0.2.1" rand = "0.10.0" num-integer = "0.1.46" ryu-js = "1.0.2" diff --git a/core/engine/Cargo.toml b/core/engine/Cargo.toml index 1355ce7e790..f7b786911c0 100644 --- a/core/engine/Cargo.toml +++ b/core/engine/Cargo.toml @@ -118,7 +118,7 @@ ryu-js.workspace = true fast-float2.workspace = true tap.workspace = true small_btree.workspace = true -paste.workspace = true +pastey.workspace = true thiserror.workspace = true dashmap.workspace = true num_enum.workspace = true diff --git a/core/engine/src/vm/opcode/args.rs b/core/engine/src/vm/opcode/args.rs index 4802a8daffd..5b431cdfbba 100644 --- a/core/engine/src/vm/opcode/args.rs +++ b/core/engine/src/vm/opcode/args.rs @@ -211,7 +211,7 @@ macro_rules! impl_argument_for_int { impl Argument for $t { #[inline(always)] fn encode(self, bytes: &mut Vec) { - paste::paste! { + pastey::paste! { [](bytes, self); } } diff --git a/core/engine/src/vm/opcode/mod.rs b/core/engine/src/vm/opcode/mod.rs index b47f6994171..f01c7afecbe 100644 --- a/core/engine/src/vm/opcode/mod.rs +++ b/core/engine/src/vm/opcode/mod.rs @@ -394,7 +394,7 @@ macro_rules! generate_opcodes { impl BytecodeEmitter { $( - paste::paste! { + pastey::paste! { #[allow(unused)] pub(crate) fn [](&mut self $( $(, $FieldName: $FieldType)* )? ) { encode_instruction( @@ -412,7 +412,7 @@ macro_rules! generate_opcodes { pub(crate) const OPCODE_HANDLERS: [OpcodeHandler; 256] = { [ $( - paste::paste! { [] }, + pastey::paste! { [] }, )* ] }; @@ -422,13 +422,13 @@ macro_rules! generate_opcodes { pub(crate) const OPCODE_HANDLERS_BUDGET: [OpcodeHandlerBudget; 256] = { [ $( - paste::paste! { [] }, + pastey::paste! { [] }, )* ] }; $( - paste::paste! { + pastey::paste! { #[inline(always)] #[allow(unused_parens)] fn [](context: &mut Context, pc: usize) -> ControlFlow { @@ -442,7 +442,7 @@ macro_rules! generate_opcodes { )* $( - paste::paste! { + pastey::paste! { #[inline(always)] #[allow(unused_parens)] fn [](context: &mut Context, pc: usize, budget: &mut u32) -> ControlFlow { diff --git a/core/icu_provider/Cargo.toml b/core/icu_provider/Cargo.toml index 6c49b048146..cba0161f3f0 100644 --- a/core/icu_provider/Cargo.toml +++ b/core/icu_provider/Cargo.toml @@ -25,7 +25,7 @@ icu_normalizer = { workspace = true, features = ["serde", "datagen"] } icu_plurals = { workspace = true, features = ["serde", "datagen", "unstable"] } icu_segmenter = { workspace = true, features = ["serde", "datagen"] } once_cell = { workspace = true, default-features = false, features = ["critical-section"] } -paste.workspace = true +pastey.workspace = true [features] default = ["std"] diff --git a/core/icu_provider/src/lib.rs b/core/icu_provider/src/lib.rs index 097dc21004e..e45e1830b71 100644 --- a/core/icu_provider/src/lib.rs +++ b/core/icu_provider/src/lib.rs @@ -94,7 +94,7 @@ impl DynamicDryDataProvider for LazyBufferProvider { /// A macro that creates a [`LazyBufferProvider`] from an icu4x crate. macro_rules! provider_from_icu_crate { ($service:path) => { - paste::paste! { + pastey::paste! { LazyBufferProvider { provider: OnceCell::new(), bytes: include_bytes!(concat!( diff --git a/core/string/Cargo.toml b/core/string/Cargo.toml index fca96f4bcd5..354abeed5da 100644 --- a/core/string/Cargo.toml +++ b/core/string/Cargo.toml @@ -17,7 +17,7 @@ rustc-hash = { workspace = true, features = ["std"] } ryu-js.workspace = true static_assertions.workspace = true -paste.workspace = true +pastey.workspace = true fast-float2.workspace = true [lints] diff --git a/core/string/src/common.rs b/core/string/src/common.rs index 132c1c97afe..bf6e0e12a3e 100644 --- a/core/string/src/common.rs +++ b/core/string/src/common.rs @@ -2,7 +2,7 @@ use super::JsString; use crate::{JsStr, StaticString}; -use paste::paste; +use pastey::paste; use rustc_hash::FxHashMap; use std::sync::LazyLock;