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

Update uuid

Browse source
This commit is contained in:
Bastien Orivel 2018-11-03 12:14:39 +01:00
parent 9a41af68a4
commit 36c4208f22
13 changed files with 57 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/net/Cargo.toml
View file

@ -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"] }

2
components/net/http_loader.rs
View file

@ -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

2
components/net/tests/fetch.rs
View file

@ -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);