Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 07:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Format component of url

Browse source
This commit is contained in:
chansuke 2018-09-05 22:53:03 +09:00
parent 9070d4bc65
commit 812d4a479a
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/url/origin.rs
View file

@ -18,10 +18,13 @@ pub enum ImmutableOrigin {
/// Consists of the URL's scheme, host and port
Tuple(
String,
#[serde(deserialize_with = "url_serde::deserialize", serialize_with = "url_serde::serialize")]
#[serde(
deserialize_with = "url_serde::deserialize",
serialize_with = "url_serde::serialize"
)]
Host,
u16,
)
),
}
impl ImmutableOrigin {
@ -160,7 +163,8 @@ impl MutableOrigin {
}
pub fn effective_domain(&self) -> Option<Host> {
self.immutable().host()
self.immutable()
.host()
.map(|host| self.domain().unwrap_or_else(|| host.clone()))
}
}