Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Eliminate to_shmem dependency from servo_url (#35897)

Browse source 
Signed-off-by: Nico Burns <nico@nicoburns.com>
This commit is contained in:
Nico Burns 2025-03-11 13:33:39 +13:00 • committed by GitHub
parent fd0e2125c6
commit 4611c8b0e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -6880,7 +6880,6 @@ dependencies = [
"servo_arc", "servo_arc",
"servo_malloc_size_of", "servo_malloc_size_of",
"servo_rand", "servo_rand",
"to_shmem",
"url", "url",
"uuid", "uuid",
] ]

1
Cargo.toml
View file

@ -144,7 +144,6 @@ thin-vec = "0.2.13"
tikv-jemalloc-sys = "0.6.0" tikv-jemalloc-sys = "0.6.0"
tikv-jemallocator = "0.6.0" tikv-jemallocator = "0.6.0"
time = { package = "time", version = "0.3", features = ["large-dates", "local-offset", "serde"] } 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 = "1"
tokio-rustls = { version = "0.26", default-features = false, features = ["logging"] } tokio-rustls = { version = "0.26", default-features = false, features = ["logging"] }
tower-service = "0.3" tower-service = "0.3"

1
components/url/Cargo.toml
View file

@ -17,6 +17,5 @@ malloc_size_of_derive = { workspace = true }
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
servo_arc = { workspace = true } servo_arc = { workspace = true }
servo_rand = { path = "../rand" } servo_rand = { path = "../rand" }
to_shmem = { workspace = true }
url = { workspace = true, features = ["serde"] } url = { workspace = true, features = ["serde"] }
uuid = { workspace = true, features = ["serde"] } uuid = { workspace = true, features = ["serde"] }

9
components/url/lib.rs
View file

@ -18,7 +18,6 @@ use std::path::Path;
use malloc_size_of_derive::MallocSizeOf; use malloc_size_of_derive::MallocSizeOf;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use servo_arc::Arc; use servo_arc::Arc;
use to_shmem::{SharedMemoryBuilder, ToShmem};
pub use url::Host; pub use url::Host;
use url::{Position, Url}; use url::{Position, Url};
@ -38,14 +37,6 @@ pub enum UrlError {
#[derive(Clone, Deserialize, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd, Serialize)] #[derive(Clone, Deserialize, Eq, Hash, MallocSizeOf, Ord, PartialEq, PartialOrd, Serialize)]
pub struct ServoUrl(#[ignore_malloc_size_of = "Arc"] Arc<Url>); 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 { impl ServoUrl {
pub fn from_url(url: Url) -> Self { pub fn from_url(url: Url) -> Self {
ServoUrl(Arc::new(url)) ServoUrl(Arc::new(url))