eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-03 12:52:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to rust-url 1.0 and hyper 0.9

Browse Source
This commit is contained in:
Simon Sapin
2016-04-21 00:18:37 +02:00
parent 305c283602
commit 7932ab6ac2
76 changed files with 524 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/script/dom/htmlbaseelement.rs
View File

@@ -68,7 +68,7 @@ impl HTMLBaseElementMethods for HTMLBaseElement {
// Step 1.
if !self.upcast::<Element>().has_attribute(&atom!("href")) {
return DOMString::from(document.base_url().serialize());
return DOMString::from(document.base_url().as_str());
}
// Step 2.
@@ -81,7 +81,7 @@ impl HTMLBaseElementMethods for HTMLBaseElement {
let url_record = fallback_base_url.join(&*url);
// Step 5, 6.
DOMString::from(url_record.ok().map_or("".to_owned(), |record| record.serialize()))
DOMString::from(url_record.as_ref().map(|url| url.as_str()).unwrap_or(""))
}
// https://html.spec.whatwg.org/multipage/#dom-base-href