Skip to content

Commit 1739b49

Browse files
rjobanprjobanp
committed
Update rust version to 1.77, chrono to 0.4.35
1 parent 96e7850 commit 1739b49

File tree

89 files changed

+408
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+408
-276
lines changed

‎Cargo.lock

Lines changed: 62 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ resolver = "2"
138138

139139
[workspace.package]
140140
edition = "2021"
141-
rust-version = "1.76.0"
141+
rust-version = "1.77.0"
142142

143143
[profile.dev]
144144
split-debuginfo = "unpacked"

‎bin/ci-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -euo pipefail
1818

19-
NIGHTLY_RUST_DATE=2024-01-01
19+
NIGHTLY_RUST_DATE=2024-02-01
2020

2121
cd "$(dirname "$0")/.."
2222

‎bin/lint-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#
1212
# lint-versions - Check rust version
1313

14-
grep "rust-version = " Cargo.toml | grep -q "1\.76\.0" || \
14+
grep "rust-version = " Cargo.toml | grep -q "1\.77\.0" || \
1515
(echo "Please validate new Rust versions for compilation time performance regressions or ask Team Testing to do so. Afterwards change the tested version in bin/lint-versions" && exit 1)

‎ci/builder/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,18 @@ RUN mkdir rust \
188188
&& tar -xzf rust-src.tar.gz -C /usr/local/lib/rustlib/src/rust --strip-components=1 \
189189
&& rm -f rust-src.asc rust-src.tar.gz \
190190
&& case $RUST_COMPONENTS in *miri*) \
191-
PATH=$PATH:/root/.cargo/bin cargo miri setup \
192-
;; \
191+
PATH=$PATH:/root/.cargo/bin cargo miri setup \
192+
;; \
193193
esac \
194194
&& curl -fsSL https://static.rust-lang.org/dist$RUST_DATE/rust-std-$RUST_VERSION-wasm32-unknown-unknown.tar.gz > rust.tar.gz \
195195
&& curl -fsSL https://static.rust-lang.org/dist$RUST_DATE/rust-std-$RUST_VERSION-wasm32-unknown-unknown.tar.gz.asc > rust.asc \
196196
&& gpg --verify rust.asc rust.tar.gz \
197197
&& tar -xzf rust.tar.gz -C /usr/local/lib/rustlib/ --strip-components=4 \
198198
&& rm -rf rust.asc rust.tar.gz rust \
199199
&& cargo install --root /usr/local --version "=0.8.0" --locked cargo-vet \
200-
&& cargo install --root /usr/local --version "=0.6.0" --locked cargo-about \
200+
&& cargo install --root /usr/local --version "=0.6.1" --locked cargo-about \
201201
&& cargo install --root /usr/local --version "=2.0.2" --locked cargo-deb \
202-
&& cargo install --root /usr/local --version "=0.12.2" --locked cargo-deny \
202+
&& cargo install --root /usr/local --version "=0.14.20" --locked cargo-deny \
203203
&& cargo install --root /usr/local --version "=0.1.0" --locked cargo-deplint \
204204
&& cargo install --root /usr/local --version ="0.9.28" --locked cargo-hakari \
205205
&& cargo install --root /usr/local --version "=0.9.63" --locked cargo-nextest \
@@ -261,13 +261,13 @@ RUN if [ $ARCH_GCC = x86_64 ]; then \
261261
# Install KinD and kubectl
262262

263263
RUN curl -fsSL https://kind.sigs.k8s.io/dl/v0.14.0/kind-linux-$ARCH_GO > /usr/local/bin/kind \
264-
&& chmod +x /usr/local/bin/kind
264+
&& chmod +x /usr/local/bin/kind
265265

266266
RUN if [ $ARCH_GO = amd64 ]; then echo 'af5e8331f2165feab52ec2ae07c427c7b66f4ad044d09f253004a20252524c8b /usr/local/bin/kind' | sha256sum --check; fi
267267
RUN if [ $ARCH_GO = arm64 ]; then echo '95c9601f21fdb2c286442339d5e370149b4fe2fc7c49f615647e4e27bdfb17e2 /usr/local/bin/kind' | sha256sum --check; fi
268268

269269
RUN curl -fsSL https://dl.k8s.io/release/v1.24.3/bin/linux/$ARCH_GO/kubectl > /usr/local/bin/kubectl \
270-
&& chmod +x /usr/local/bin/kubectl
270+
&& chmod +x /usr/local/bin/kubectl
271271

272272
RUN if [ $ARCH_GO = amd64 ]; then echo '8a45348bdaf81d46caf1706c8bf95b3f431150554f47d444ffde89e8cdd712c1 /usr/local/bin/kubectl' | sha256sum --check; fi
273273
RUN if [ $ARCH_GO = arm64 ]; then echo 'bdad4d3063ddb7bfa5ecf17fb8b029d5d81d7d4ea1650e4369aafa13ed97149a /usr/local/bin/kubectl' | sha256sum --check; fi

‎deny.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ skip = [
2727
{ name = "windows_x86_64_gnullvm", version = "0.42.0" },
2828
{ name = "windows_x86_64_gnu", version = "0.42.0" },
2929
{ name = "windows_x86_64_msvc", version = "0.42.0" },
30+
{ name = "windows-targets", version = "0.48.0" },
31+
{ name = "windows-sys", version = "0.48.0" },
32+
{ name = "windows_aarch64_gnullvm", version = "0.48.0" },
33+
{ name = "windows_aarch64_msvc", version = "0.48.0" },
34+
{ name = "windows_i686_gnu", version = "0.48.0" },
35+
{ name = "windows_i686_msvc", version = "0.48.0" },
36+
{ name = "windows_x86_64_gnullvm", version = "0.48.0" },
37+
{ name = "windows_x86_64_gnu", version = "0.48.0" },
38+
{ name = "windows_x86_64_msvc", version = "0.48.0" },
3039
# Newer versions of crates like `tempfile` are held back by crates like `atty`.
3140
# This is very Unfortunate as we don't actually use these platforms.
3241
{ name = "hermit-abi", version = "0.1.6" },

‎misc/cargo-vet/audits.toml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,26 @@ who = "Roshan Jobanputra <roshan@materialize.com>"
3030
criteria = "safe-to-deploy"
3131
version = "1.0.1"
3232

33+
[[audits.chrono]]
34+
who = "Roshan Jobanputra <roshan@materialize.com>"
35+
criteria = "safe-to-deploy"
36+
version = "0.4.35"
37+
38+
[[audits.chrono-tz]]
39+
who = "Roshan Jobanputra <roshan@materialize.com>"
40+
criteria = "safe-to-deploy"
41+
version = "0.8.1"
42+
43+
[[audits.chrono-tz-build]]
44+
who = "Roshan Jobanputra <roshan@materialize.com>"
45+
criteria = "safe-to-deploy"
46+
version = "0.1.0"
47+
48+
[[audits.chrono-tz-build]]
49+
who = "Roshan Jobanputra <roshan@materialize.com>"
50+
criteria = "safe-to-deploy"
51+
version = "0.2.1"
52+
3353
[[audits.core_affinity]]
3454
who = "Jan Teske <jteske@posteo.net>"
3555
criteria = "safe-to-deploy"
@@ -316,6 +336,46 @@ who = "Gus Wynn <gus@materialize.com>"
316336
criteria = "maintained-and-necessary"
317337
version = "0.2.4"
318338

339+
[[audits.windows-targets]]
340+
who = "Roshan Jobanputra <roshan@materialize.com>"
341+
criteria = "safe-to-deploy"
342+
version = "0.52.4"
343+
344+
[[audits.windows_aarch64_gnullvm]]
345+
who = "Roshan Jobanputra <roshan@materialize.com>"
346+
criteria = "safe-to-deploy"
347+
version = "0.52.4"
348+
349+
[[audits.windows_aarch64_msvc]]
350+
who = "Roshan Jobanputra <roshan@materialize.com>"
351+
criteria = "safe-to-deploy"
352+
version = "0.52.4"
353+
354+
[[audits.windows_i686_gnu]]
355+
who = "Roshan Jobanputra <roshan@materialize.com>"
356+
criteria = "safe-to-deploy"
357+
version = "0.52.4"
358+
359+
[[audits.windows_i686_msvc]]
360+
who = "Roshan Jobanputra <roshan@materialize.com>"
361+
criteria = "safe-to-deploy"
362+
version = "0.52.4"
363+
364+
[[audits.windows_x86_64_gnu]]
365+
who = "Roshan Jobanputra <roshan@materialize.com>"
366+
criteria = "safe-to-deploy"
367+
version = "0.52.4"
368+
369+
[[audits.windows_x86_64_gnullvm]]
370+
who = "Roshan Jobanputra <roshan@materialize.com>"
371+
criteria = "safe-to-deploy"
372+
version = "0.52.4"
373+
374+
[[audits.windows_x86_64_msvc]]
375+
who = "Roshan Jobanputra <roshan@materialize.com>"
376+
criteria = "safe-to-deploy"
377+
version = "0.52.4"
378+
319379
[[audits.winreg]]
320380
who = "Matt Jibson <matt.jibson@gmail.com>"
321381
criteria = "safe-to-deploy"

‎misc/cargo-vet/config.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -262,18 +262,6 @@ criteria = "safe-to-deploy"
262262
version = "0.3.0"
263263
criteria = "safe-to-deploy"
264264

265-
[[exemptions.chrono]]
266-
version = "0.4.25"
267-
criteria = "safe-to-deploy"
268-
269-
[[exemptions.chrono-tz]]
270-
version = "0.8.1"
271-
criteria = "safe-to-deploy"
272-
273-
[[exemptions.chrono-tz-build]]
274-
version = "0.1.0"
275-
criteria = "safe-to-deploy"
276-
277265
[[exemptions.chunked_transfer]]
278266
version = "1.4.0"
279267
criteria = "safe-to-deploy"

‎misc/python/materialize/mzbuild.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,11 @@ def generate_cargo_build_command(
281281
rustflags = (
282282
rustc_flags.coverage
283283
if rd.coverage
284-
else rustc_flags.sanitizer[rd.sanitizer]
285-
if rd.sanitizer != Sanitizer.none
286-
else ["--cfg=tokio_unstable"]
284+
else (
285+
rustc_flags.sanitizer[rd.sanitizer]
286+
if rd.sanitizer != Sanitizer.none
287+
else ["--cfg=tokio_unstable"]
288+
)
287289
)
288290
cflags = (
289291
[
@@ -428,7 +430,16 @@ def copy(exe: Path) -> None:
428430
# Some crates are built for both the host and the target.
429431
# Ignore the built-for-host out dir.
430432
continue
431-
package = message["package_id"].split()[0]
433+
# parse the package name from a package_id that looks like one of:
434+
# git+https://github.com/MaterializeInc/rust-server-sdk#launchdarkly-server-sdk@1.0.0
435+
# path+file:///Users/roshan/materialize/src/catalog#mz-catalog@0.0.0
436+
# registry+https://github.com/rust-lang/crates.io-index#num-rational@0.4.0
437+
# file:///path/to/my-package#0.1.0
438+
package_id = message["package_id"]
439+
if "@" in package_id:
440+
package = package_id.split("@")[0].split("#")[-1]
441+
else:
442+
package = message["package_id"].split("#")[0].split("/")[-1]
432443
for src, dst in self.extract.get(package, {}).items():
433444
spawn.runv(["cp", "-R", out_dir / src, self.path / dst])
434445

‎src/adapter/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ anyhow = "1.0.66"
1414
async-trait = "0.1.68"
1515
bytes = "1.3.0"
1616
bytesize = "1.1.0"
17-
chrono = { version = "0.4.23", default-features = false, features = ["std"] }
17+
chrono = { version = "0.4.35", default-features = false, features = ["std"] }
1818
dec = "0.4.8"
1919
deadpool-postgres = "0.10.3"
2020
derivative = "2.2.0"

0 commit comments

Comments
 (0)