language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-07-24 13:44:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use system rustfmt instead of fixed binary (#2701)

Browse source
This commit is contained in:
Ryan Dahl 2019-07-31 17:11:37 -04:00 • committed by GitHub
parent b3541c38f5
commit 3971dcfe10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 252 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cli/http_util.rs
View file

@ -170,12 +170,14 @@ pub fn fetch_string(
DenoError::new(
deno_error::ErrorKind::NotFound,
"module not found".to_string(),
).into(),
)
.into(),
);
}
Ok(Loop::Break(response))
})
}).and_then(|response| {
})
.and_then(|response| {
let content_type = response
.headers()
.get(CONTENT_TYPE)
@ -186,7 +188,8 @@ pub fn fetch_string(
.map(|body| String::from_utf8(body.to_vec()).unwrap())
.map_err(ErrBox::from);
body.join(future::ok(content_type))
}).and_then(|(body_string, maybe_content_type)| {
})
.and_then(|(body_string, maybe_content_type)| {
future::ok((body_string, maybe_content_type.unwrap()))
})
}