diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-23 11:28:31 -0700 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-23 11:28:31 -0700 |
commit | 84ab7e9fe8f4a6528995eff3eb6e814cb724c364 (patch) | |
tree | c147ef89425697fd545a7a86518e2f37abd102a5 /components/layout/layout_thread.rs | |
parent | 305c283602882850be9d39c43b980d0fc0f93a3c (diff) | |
parent | e66260513834e4ffafcd1539649432068c0ecc70 (diff) | |
download | servo-84ab7e9fe8f4a6528995eff3eb6e814cb724c364.tar.gz servo-84ab7e9fe8f4a6528995eff3eb6e814cb724c364.zip |
Auto merge of #9840 - servo:url-1.0, r=asajeffrey
Update to rust-url 1.0
**Do not merge yet:** rust-url 1.0 is not published yet and may still get breaking changes. The goal of this PR for now is to demonstrate API usage.
Depends on:
* <s>https://github.com/servo/rust-url/pull/176</s>
* <s>https://github.com/alexcrichton/cookie-rs/pull/42</s>
* <s>https://github.com/hyperium/hyper/pull/740</s>
* https://github.com/cyderize/rust-websocket/pull/70
* https://github.com/jgraham/webdriver-rust/pull/28
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9840)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/layout_thread.rs')
-rw-r--r-- | components/layout/layout_thread.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs index cdfb348288b..64779f8e031 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -1002,7 +1002,7 @@ impl LayoutThread { let document = unsafe { ServoLayoutNode::new(&data.document) }; let document = document.as_document().unwrap(); - debug!("layout: received layout request for: {}", self.url.borrow().serialize()); + debug!("layout: received layout request for: {}", *self.url.borrow()); let mut rw_data = possibly_locked_rw_data.lock(); @@ -1048,8 +1048,7 @@ impl LayoutThread { Some(x) => x, }; - debug!("layout: received layout request for: {}", - self.url.borrow().serialize()); + debug!("layout: received layout request for: {}", *self.url.borrow()); if log_enabled!(log::LogLevel::Debug) { node.dump(); } @@ -1463,7 +1462,7 @@ impl LayoutThread { /// Returns profiling information which is passed to the time profiler. fn profiler_metadata(&self) -> Option<TimerMetadata> { Some(TimerMetadata { - url: self.url.borrow().serialize(), + url: self.url.borrow().to_string(), iframe: if self.is_iframe { TimerMetadataFrameType::IFrame } else { |