aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/bluetooth/Cargo.toml2
-rw-r--r--components/net/Cargo.toml2
-rw-r--r--components/net/http_loader.rs2
-rw-r--r--components/net/tests/fetch.rs2
-rw-r--r--components/net_traits/Cargo.toml2
-rw-r--r--components/rand/Cargo.toml2
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/dom/baseaudiocontext.rs2
-rw-r--r--components/script/dom/node.rs2
-rw-r--r--components/script/dom/url.rs2
-rw-r--r--components/url/Cargo.toml2
-rw-r--r--components/webdriver_server/Cargo.toml2
12 files changed, 12 insertions, 12 deletions
diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml
index d6dbf63db4a..b1e8680eac4 100644
--- a/components/bluetooth/Cargo.toml
+++ b/components/bluetooth/Cargo.toml
@@ -18,7 +18,7 @@ ipc-channel = "0.11"
log = "0.4"
servo_config = {path = "../config"}
servo_rand = {path = "../rand"}
-uuid = {version = "0.6", features = ["v4"]}
+uuid = {version = "0.7", features = ["v4"]}
[features]
disable-native-bluetooth = []
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index ce05657d371..3ea3b9f117b 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -55,7 +55,7 @@ tokio-timer = "0.2"
threadpool = "1.0"
time = "0.1.17"
url = "1.2"
-uuid = {version = "0.6", features = ["v4"]}
+uuid = {version = "0.7", features = ["v4"]}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
ws = { version = "0.7", features = ["ssl"] }
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index ab1de55a1c9..0ef715361fe 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -1166,7 +1166,7 @@ fn http_network_fetch(
let request_id = context
.devtools_chan
.as_ref()
- .map(|_| uuid::Uuid::new_v4().simple().to_string());
+ .map(|_| uuid::Uuid::new_v4().to_simple().to_string());
// XHR uses the default destination; other kinds of fetches (which haven't been implemented yet)
// do not. Once we support other kinds of fetches we'll need to be more fine grained here
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index 2414bb153e9..5183c8d8ff4 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -144,7 +144,7 @@ fn test_fetch_blob() {
.filemanager
.promote_memory(blob_buf, true, sender, "http://www.example.org".into());
let id = receiver.recv().unwrap().unwrap();
- let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.simple())).unwrap();
+ let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.to_simple())).unwrap();
let mut request = Request::new(url, Some(Origin::Origin(origin.origin())), None);
let fetch_response = fetch_with_context(&mut request, &context);
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index 6fb2c926dd8..1c337f87c75 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -37,7 +37,7 @@ servo_arc = {path = "../servo_arc"}
servo_config = {path = "../config"}
servo_url = {path = "../url"}
url = "1.2"
-uuid = {version = "0.6", features = ["v4", "serde"]}
+uuid = {version = "0.7", features = ["v4", "serde"]}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
[dev-dependencies]
diff --git a/components/rand/Cargo.toml b/components/rand/Cargo.toml
index e41309fe56e..8550b6763cd 100644
--- a/components/rand/Cargo.toml
+++ b/components/rand/Cargo.toml
@@ -14,4 +14,4 @@ path = "lib.rs"
lazy_static = "1"
log = "0.4"
rand = "0.4"
-uuid = "0.6.2"
+uuid = "0.7"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index f2fd91df9bb..8b5a0399141 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -109,7 +109,7 @@ time = "0.1.12"
unicode-segmentation = "1.1.0"
url = "1.6"
utf-8 = "0.7"
-uuid = {version = "0.6", features = ["v4"]}
+uuid = {version = "0.7", features = ["v4"]}
xml5ever = {version = "0.12"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr_traits = {path = "../webvr_traits"}
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
}
diff --git a/components/url/Cargo.toml b/components/url/Cargo.toml
index 2b0463bd56f..b6a97d5ac51 100644
--- a/components/url/Cargo.toml
+++ b/components/url/Cargo.toml
@@ -17,4 +17,4 @@ serde = {version = "1.0", features = ["derive"]}
servo_rand = {path = "../rand"}
url = "1.2"
url_serde = {version = "0.2"}
-uuid = {version = "0.6.0", features = ["v4", "serde"]}
+uuid = {version = "0.7", features = ["v4", "serde"]}
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
index f3323385566..d3ccfcc05dc 100644
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@@ -29,5 +29,5 @@ servo_channel = {path = "../channel"}
servo_config = {path = "../config"}
servo_url = {path = "../url"}
url = "1.2"
-uuid = {version = "0.6", features = ["v4"]}
+uuid = {version = "0.7", features = ["v4"]}
webdriver = "0.37"