diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2020-06-22 13:29:04 -0400 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2020-06-22 13:29:39 -0400 |
| commit | e2ab98df085d4f2703f0a4beab4c6432c353f7fa (patch) | |
| tree | b4dbee3b6bb7a2bdbd861fb3add5f57fa8165488 /src/tools/rustc-workspace-hack | |
| parent | d3feb8baafc0ce1e1e04e237f1d059862e3173fb (diff) | |
| download | rust-e2ab98df085d4f2703f0a4beab4c6432c353f7fa.tar.gz rust-e2ab98df085d4f2703f0a4beab4c6432c353f7fa.zip | |
Stop using old version of `syn` in `rustc-workspace-hack`
None of the tools seem to need syn 0.15.35, so we can just build syn 1.0. This was causing an issue with clippy's `compile-test` program: since multiple versions of `syn` would exist in the build directory, we would non-deterministically pick one based on filesystem iteration order. If the pre-1.0 version of `syn` was picked, a strange build error would occur (see https://github.com/rust-lang/rust/pull/73594#issuecomment-647671463) To prevent this kind of issue from happening again, we now panic if we find multiple versions of a crate in the build directly, instead of silently picking the first version we find.
Diffstat (limited to 'src/tools/rustc-workspace-hack')
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 1b1f4447966..351e2d4481c 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -69,8 +69,7 @@ serde = { version = "1.0.82", features = ['derive'] } serde_json = { version = "1.0.31", features = ["raw_value"] } smallvec-0_6 = { package = "smallvec", version = "0.6", features = ['union', 'may_dangle'] } smallvec = { version = "1.0", features = ['union', 'may_dangle'] } -syn = { version = "0.15", features = ['full', 'extra-traits'] } -syn-1 = { package = "syn", version = "1", features = ['fold', 'full', 'extra-traits', 'visit'] } +syn = { version = "1", features = ['fold', 'full', 'extra-traits', 'visit'] } url = { version = "2.0", features = ['serde'] } [target.'cfg(not(windows))'.dependencies] |