diff options
| author | Nico Burns <nico@nicoburns.com> | 2025-03-11 13:33:39 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-11 00:33:39 +0000 |
| commit | 4611c8b0e14bc9965196a5f23d148d29902324ed (patch) | |
| tree | fc8e1058406e28790b3045de844911629910d19a | |
| parent | fd0e2125c60506fea5408b34a0c2021b8ca7bf00 (diff) | |
| download | servo-4611c8b0e14bc9965196a5f23d148d29902324ed.tar.gz servo-4611c8b0e14bc9965196a5f23d148d29902324ed.zip | |
Eliminate to_shmem dependency from servo_url (#35897)
Signed-off-by: Nico Burns <nico@nicoburns.com>
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | components/url/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/url/lib.rs | 9 |
4 files changed, 0 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock index e1a98f62baf..4cbe11238da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6880,7 +6880,6 @@ dependencies = [ "servo_arc", "servo_malloc_size_of", "servo_rand", - "to_shmem", "url", "uuid", ] diff --git a/Cargo.toml b/Cargo.toml index 2e31d384987..fee6acac083 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -144,7 +144,6 @@ thin-vec = "0.2.13" tikv-jemalloc-sys = "0.6.0" tikv-jemallocator = "0.6.0" time = { package = "time", version = "0.3", features = ["large-dates", "local-offset", "serde"] } -to_shmem = { git = "https://github.com/servo/stylo", branch = "2025-03-01" } tokio = "1" tokio-rustls = { version = "0.26", default-features = false, features = ["logging"] } tower-service = "0.3" diff --git a/components/url/Cargo.toml b/components/url/Cargo.toml index 84bc65a862b..4b88768a054 100644 --- a/components/url/Cargo.toml +++ b/components/url/Cargo.toml @@ -17,6 +17,5 @@ malloc_size_of_derive = { workspace = true } serde = { workspace = true, features = ["derive"] } servo_arc = { workspace = true } servo_rand = { path = "../rand" } -to_shmem = { workspace = true } url = { workspace = true, features = ["serde"] } uuid = { workspace = true, features = ["serde"] } diff --git a/components/url/lib.rs b/components/url/lib.rs index 447915f36f9..17a8e6523a4 100644 --- a/components/url/lib.rs +++ b/components/url/lib.rs @@ -18,7 +18,6 @@ use std::path::Path; use malloc_size_of_derive::MallocSizeOf; use serde::{Deserialize, Serialize}; use servo_arc::Arc; -use to_shmem::{SharedMemoryBuilder, ToShmem}; pub use url::Host; use url::{Position, Url}; @@ -38,14 +37,6 @@ pub enum UrlError { #[derive(Clone, Deserialize, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd, Serialize)] pub struct ServoUrl(#[ignore_malloc_size_of = "Arc"] Arc<Url>); -impl ToShmem for ServoUrl { - fn to_shmem(&self, _builder: &mut SharedMemoryBuilder) -> to_shmem::Result<Self> { - unimplemented!( - "If servo wants to share stylesheets across processes, ToShmem for Url must be implemented" - ) - } -} - impl ServoUrl { pub fn from_url(url: Url) -> Self { ServoUrl(Arc::new(url)) |