From 66d96aac11509ce6971f63a81563ef53bcc833df Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 20 Aug 2018 11:23:02 -0700 Subject: [PATCH] Fix merge conflicts with `fetch` example --- examples/fetch/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/fetch/src/lib.rs b/examples/fetch/src/lib.rs index 1964917d..1b4854cb 100644 --- a/examples/fetch/src/lib.rs +++ b/examples/fetch/src/lib.rs @@ -51,12 +51,12 @@ pub fn run() -> Promise { request_options.method("GET"); request_options.mode(RequestMode::Cors); - let req = Request::new_using_usv_str_and_request_init("https://api.github.com/repos/rustwasm/wasm-bindgen/branches/master", &request_options).unwrap(); + let req = Request::new_with_str_and_request_init("https://api.github.com/repos/rustwasm/wasm-bindgen/branches/master", &request_options).unwrap(); // the RequestInit struct will eventually support setting headers, but that's missing right now req.headers().set("Accept", "application/vnd.github.v3+json").unwrap(); - let req_promise = window.fetch_using_request(&req); + let req_promise = window.fetch_with_request(&req); let to_return = JsFuture::from(req_promise).and_then(|resp_value| { // resp_value is a Response object