Skip to content

Commit f442a18

Browse files
committed
Auto merge of #50254 - alexcrichton:beta-next, r=Mark-Simulacrum
[beta] Remove dependency on `parking_lot` Unfortunately the `parking_lot` crate enables the `synchapi` feature of the `winapi` crate which activates a dependency on `libsynchronization.a`. The MinGW version of `libsynchronization.a` pulls in a dependency `api-ms-core-synch-l1-2-0.dll` which causes rustc to not work on Windows 7 (tracked in #49438) The `parking_lot` crate is not currently used in the compiler unless parallel queries are enabled. This feature is not enabled by default and not used at all in the beta/stable compilers. As a result the dependency in this commit was removed and the CI build which checks parallel queries was disabled. This isn't a great long-term solution but should hopefully be enough of a patch for beta to buy us some more time to figure this out.
2 parents 9f8ae06 + 93fb6b6 commit f442a18

File tree

4 files changed

+0
-9
lines changed

4 files changed

+0
-9
lines changed

src/Cargo.lock

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ci/docker/x86_64-gnu-debug/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
COPY scripts/sccache.sh /scripts/
1717
RUN sh /scripts/sccache.sh
1818

19-
ENV PARALLEL_CHECK 1
2019
ENV RUST_CONFIGURE_ARGS \
2120
--build=x86_64-unknown-linux-gnu \
2221
--enable-debug \

src/librustc_data_structures/Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,3 @@ log = "0.4"
1414
serialize = { path = "../libserialize" }
1515
cfg-if = "0.1.2"
1616
stable_deref_trait = "1.0.0"
17-
parking_lot_core = "0.2.8"
18-
19-
[dependencies.parking_lot]
20-
version = "0.5"
21-
features = ["nightly"]

src/librustc_data_structures/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ extern crate log;
4545
extern crate serialize as rustc_serialize; // used by deriving
4646
#[cfg(unix)]
4747
extern crate libc;
48-
extern crate parking_lot;
4948
#[macro_use]
5049
extern crate cfg_if;
5150
extern crate stable_deref_trait;

0 commit comments

Comments
 (0)