Merge branch 'release-2.0' into rm-rayon
This commit is contained in:
@@ -15,7 +15,7 @@ edition = "2018"
|
||||
features = [ "tls", "json", "charset", "cookies", "socks-proxy" ]
|
||||
|
||||
[features]
|
||||
default = ["tls", "cookies"]
|
||||
default = ["tls"]
|
||||
json = ["serde", "serde_json"]
|
||||
charset = ["encoding"]
|
||||
tls = ["rustls", "webpki", "webpki-roots"]
|
||||
@@ -38,13 +38,12 @@ rustls-native-certs = { version = "0.4", optional = true }
|
||||
serde = { version = "1", optional = true }
|
||||
serde_json = { version = "1", optional = true }
|
||||
encoding = { version = "0.2", optional = true }
|
||||
native-tls = { version = "0.2", optional = true }
|
||||
cookie_store = { version = "0.12.0", optional = true }
|
||||
log = "0.4.11"
|
||||
|
||||
[dev-dependencies]
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
env_logger = "0.7.1"
|
||||
env_logger = "0.8.1"
|
||||
|
||||
[[example]]
|
||||
name = "smoke-test"
|
||||
|
||||
Reference in New Issue
Block a user