foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-12 00:54:02 -05:00
Code Issues Packages 1 Wiki Activity

Use reqwest from deno_fetch export (#7562)

Browse source
This commit is contained in:
Ryan Dahl 2020-09-18 13:07:09 -04:00 committed by GitHub
parent 4c2920ddd7
commit 526d668102
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -425,7 +425,6 @@ dependencies = [
"os_pipe", "os_pipe",
"rand 0.7.3", "rand 0.7.3",
"regex", "regex",
"reqwest",
"ring", "ring",
"rustyline", "rustyline",
"semver-parser 0.9.0", "semver-parser 0.9.0",

1
cli/Cargo.toml
View file

@ -56,7 +56,6 @@ env_logger = "0.7.1"
notify = "5.0.0-pre.3" notify = "5.0.0-pre.3"
rand = "0.7.3" rand = "0.7.3"
regex = "1.3.9" regex = "1.3.9"
reqwest = { version = "0.10.8", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] }
ring = "0.16.15" ring = "0.16.15"
rustyline = { version = "6.3.0", default-features = false } rustyline = { version = "6.3.0", default-features = false }
serde = { version = "1.0.116", features = ["derive"] } serde = { version = "1.0.116", features = ["derive"] }

1
cli/errors.rs
View file

@ -14,6 +14,7 @@ use crate::import_map::ImportMapError;
use deno_core::error::AnyError; use deno_core::error::AnyError;
use deno_core::url; use deno_core::url;
use deno_core::ModuleResolutionError; use deno_core::ModuleResolutionError;
use deno_fetch::reqwest;
use rustyline::error::ReadlineError; use rustyline::error::ReadlineError;
use std::env; use std::env;
use std::error::Error; use std::error::Error;

1
cli/file_fetcher.rs
View file

@ -15,6 +15,7 @@ use deno_core::error::AnyError;
use deno_core::url; use deno_core::url;
use deno_core::url::Url; use deno_core::url::Url;
use deno_core::ModuleSpecifier; use deno_core::ModuleSpecifier;
use deno_fetch::reqwest;
use futures::future::FutureExt; use futures::future::FutureExt;
use log::info; use log::info;
use std::borrow::Cow; use std::borrow::Cow;

19
cli/http_util.rs
View file

@ -5,15 +5,16 @@ use bytes::Bytes;
use deno_core::error::generic_error; use deno_core::error::generic_error;
use deno_core::error::AnyError; use deno_core::error::AnyError;
use deno_core::url::Url; use deno_core::url::Url;
use reqwest::header::HeaderMap; use deno_fetch::reqwest;
use reqwest::header::HeaderValue; use deno_fetch::reqwest::header::HeaderMap;
use reqwest::header::IF_NONE_MATCH; use deno_fetch::reqwest::header::HeaderValue;
use reqwest::header::LOCATION; use deno_fetch::reqwest::header::IF_NONE_MATCH;
use reqwest::header::USER_AGENT; use deno_fetch::reqwest::header::LOCATION;
use reqwest::redirect::Policy; use deno_fetch::reqwest::header::USER_AGENT;
use reqwest::Client; use deno_fetch::reqwest::redirect::Policy;
use reqwest::Response; use deno_fetch::reqwest::Client;
use reqwest::StatusCode; use deno_fetch::reqwest::Response;
use deno_fetch::reqwest::StatusCode;
use std::cmp::min; use std::cmp::min;
use std::collections::HashMap; use std::collections::HashMap;
use std::fs::File; use std::fs::File;

4
cli/upgrade.rs
View file

@ -11,9 +11,11 @@ use crate::http_util::FetchOnceResult;
use crate::AnyError; use crate::AnyError;
use deno_core::error::custom_error; use deno_core::error::custom_error;
use deno_core::url::Url; use deno_core::url::Url;
use deno_fetch::reqwest;
use deno_fetch::reqwest::redirect::Policy;
use deno_fetch::reqwest::Client;
use futures::FutureExt; use futures::FutureExt;
use regex::Regex; use regex::Regex;
use reqwest::{redirect::Policy, Client};
use semver_parser::version::parse as semver_parse; use semver_parser::version::parse as semver_parse;
use semver_parser::version::Version; use semver_parser::version::Version;
use std::fs; use std::fs;