aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-11-09 15:22:27 -0500
committerGitHub <noreply@github.com>2018-11-09 15:22:27 -0500
commited0e6e1bb2f6ed7fd7b43b0ae935ce0e2b33016c (patch)
treef0001160eb3daaa75054349dd730842310d1fc07 /components/script/dom
parent9a41af68a4ea03da0fb927830ddc8e80e3b1a924 (diff)
parent36c4208f22872d996ee22b0202f313e7ba9cdacb (diff)
downloadservo-ed0e6e1bb2f6ed7fd7b43b0ae935ce0e2b33016c.tar.gz
servo-ed0e6e1bb2f6ed7fd7b43b0ae935ce0e2b33016c.zip
Auto merge of #22098 - Eijebong:uuidup, r=jdm
Update uuid <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22098) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/baseaudiocontext.rs2
-rw-r--r--components/script/dom/node.rs2
-rw-r--r--components/script/dom/url.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 3b9a0a6b105..68acce4d255 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -412,7 +412,7 @@ impl BaseAudioContextMethods for BaseAudioContext {
if audio_data.len() > 0 {
// Step 2.
// XXX detach array buffer.
- let uuid = Uuid::new_v4().simple().to_string();
+ let uuid = Uuid::new_v4().to_simple().to_string();
let uuid_ = uuid.clone();
self.decode_resolvers.borrow_mut().insert(
uuid.clone(),
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 6854dd9d9cf..6abef87acf8 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -898,7 +898,7 @@ impl Node {
}
pub fn unique_id(&self) -> String {
- self.unique_id.borrow().simple().to_string()
+ self.unique_id.borrow().to_simple().to_string()
}
pub fn summarize(&self) -> NodeInfo {
diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs
index fbca478868e..2078565edcf 100644
--- a/components/script/dom/url.rs
+++ b/components/script/dom/url.rs
@@ -147,7 +147,7 @@ impl URL {
result.push('/');
// Step 5
- result.push_str(&id.simple().to_string());
+ result.push_str(&id.to_simple().to_string());
result
}