From a13dd715f2be9810e3fa228b10d25f3b69375e3e Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 15 Sep 2023 23:52:40 +0000 Subject: [PATCH] Correct syn pinning on cargo 1.48 Sadly the pinning introduced in 050f5a90297678f2cad36feee9a1db2367e was brittle in the face of any further syn updates, and has already broken. Here we fix it by looking up the actual version of syn to pin. Note that this dependency is somewhat nonsense as its actually only a `criterion` dependency, pulled in even though we haven't set the bench flag (as we aren't yet using `resolver = 2`). --- ci/ci-tests.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh index 7b925cc85..eb42bfb01 100755 --- a/ci/ci-tests.sh +++ b/ci/ci-tests.sh @@ -30,7 +30,10 @@ PIN_RELEASE_DEPS # pin the release dependencies in our main workspace [ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p quote --precise "1.0.30" --verbose # The syn crate depends on too-new proc-macro2 starting with v2.0.33, i.e., has MSRV of 1.56 -[ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p syn:2.0.33 --precise "2.0.32" --verbose +if [ "$RUSTC_MINOR_VERSION" -lt 56 ]; then + SYN_2_DEP=$(grep -o '"syn 2.*' Cargo.lock | tr -d '",' | tr ' ' ':') + cargo update -p "$SYN_2_DEP" --precise "2.0.32" --verbose +fi # The proc-macro2 crate switched to Rust edition 2021 starting with v1.0.66, i.e., has MSRV of 1.56 [ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p proc-macro2 --precise "1.0.65" --verbose -- 2.39.5