Skip to content

Commit 8c238b3

Browse files
committed
Use lazy_static 1.2.0, remove twoway/pcmp and require rust 1.24.1+
Before this patch, multipart got into an impossible sitation with it's dependencies. It errs with: ``` error: failed to select a version for `lazy_static`. ... required by package `multipart v0.15.4` versions that meet the requirements `>= 1.0, < 1.2.0` are: 1.1.0, 1.0.2, 1.0.1, 1.0.0 all possible versions conflict with previously selected packages. previously selected package `lazy_static v1.2.0` ... which is depended on by `ring v0.13.5` ... which is depended on by `cookie v0.11.0` ... which is depended on by `rocket_http v0.4.0` ... which is depended on by `rocket v0.4.0` ... which is depended on by `multipart v0.15.4 ``` This is due to ring 0.13.3 bumping lazy_static to 1.2.0 to avoid a [soundness bug](rust-lang-nursery/lazy-static.rs#117). This patch fixes this problem by requiring at least rust 1.24.1. In addition, I noticed that the feature sse4 was depending on `twoway/pcmp`, but that has been [removed](bluss/twoway#8).
1 parent 5b9edb6 commit 8c238b3

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ branches:
44
except:
55
- fuzzing
66
rust:
7-
- 1.22.1
7+
- 1.24.1
88
- stable
99
- beta
1010
- nightly

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ license = "MIT OR Apache-2.0"
1818
readme = "README.md"
1919

2020
[dependencies]
21-
# lazy-static (pulled in by e.g. nickel, regex) is incompatible with 1.22.1
22-
lazy_static = { version = ">=1.0,<1.2.0", optional = true }
21+
lazy_static = { version = "1.2.0", optional = true }
2322
log = "0.4"
2423
mime = "0.2"
2524
mime_guess = "1.8"
@@ -55,7 +54,7 @@ nightly = []
5554
bench = []
5655
# Use this to enable SSE4.2 instructions in boundary finding
5756
# TODO: Benchmark this
58-
sse4 = ["nightly", "twoway/pcmp"]
57+
sse4 = ["nightly"]
5958
# switch uses of `Arc<String>` for `Arc<str>` (`From<String>` impl only stabilized in 1.21)
6059
use_arc_str = []
6160

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Client- and server-side abstractions for HTTP file uploads (POST requests with
55
Supports several different (**sync**hronous API) HTTP crates.
66
**Async**hronous (i.e. `futures`-based) API support will be provided by [multipart-async].
77

8-
Minimum supported Rust version: 1.22.1
8+
Minimum supported Rust version: 1.24.1
99

1010
### [Documentation](http://docs.rs/multipart/)
1111

0 commit comments

Comments
 (0)