diff options
| author | Tdxdxoz <tdxdxoz@gmail.com> | 2022-07-17 14:14:12 +0200 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2022-09-01 22:05:45 +0200 |
| commit | 85d82bfd0c244d88fb01a1e761606d78868dc49c (patch) | |
| tree | 286391a5fc28f2d9cfc31ef80137682fbe091b25 /build | |
| parent | 7815d645045b62ca74f6caabbb4cd2b60c33a6c4 (diff) | |
| download | thrift-85d82bfd0c244d88fb01a1e761606d78868dc49c.tar.gz | |
THRIFT-5600: upgrade rust toolchain to 1.61 and edition 2021
THRIFT-5606: Wrong indent for const double
Client: rs
Patch: Ommy Zhang <tdxdxoz@gmail.com>
This closes #2634
Diffstat (limited to 'build')
| -rw-r--r-- | build/docker/README.md | 6 | ||||
| -rw-r--r-- | build/docker/ubuntu-bionic/Dockerfile | 2 | ||||
| -rw-r--r-- | build/docker/ubuntu-disco/Dockerfile | 2 | ||||
| -rw-r--r-- | build/docker/ubuntu-xenial/Dockerfile | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/build/docker/README.md b/build/docker/README.md index 7ea986f15..1746d6db4 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -172,7 +172,7 @@ Last updated: October 1, 2017 | C++ gcc | 5.4.0 | 7.4.0 | | | C++ clang | 3.8 | 6.0 | | | C# (mono) | 4.2.1.0 | 4.6.2.7 | | -| c_glib | 2.48.2 | 2.56.4 | | +| c\_glib | 2.48.2 | 2.56.4 | | | cl (sbcl) | | 1.5.3 | | | d | 2.087.0 | 2.087.0 | | | dart | 2.0.0 | 2.4.0 | | @@ -180,7 +180,7 @@ Last updated: October 1, 2017 | erlang | OTP-18 | OTP-23 | | | go | 1.15.10 | 1.16.2 | | | haxe | 3.2.1 | 3.4.4 | THRIFT-4352: avoid 3.4.2 | -| java | 1.8.0_191 | 11.0.3 | | +| java | 1.8.0\_191 | 11.0.3 | | | js | Node.js 6.17.1, V8 5.1.281.111, npm 3.10.10 | Node.js 10.18.0, V8 6.8.275.32, npm 6.13.4 | | | lua | | 5.2.4 | Lua 5.3: see THRIFT-4386 | | netstd | 6.0 | 6.0 | | @@ -191,6 +191,6 @@ Last updated: October 1, 2017 | python | 2.7.12 | 2.7.15 | | | python3 | 3.5.2 | 3.6.8 | | | ruby | 2.3.1p112 | 2.5.1p57 | | -| rust | 1.40.0 | 1.40.0 | | +| rust | 1.61.0 | 1.61.0 | | | smalltalk | | | Not in CI | | swift | | 5.1.4 | | diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile index aff9df4f0..1c859dd54 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -254,7 +254,7 @@ RUN apt-get install -y --no-install-recommends \ ruby-bundler # Rust dependencies -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.40.0 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.61.0 -y ENV PATH /root/.cargo/bin:$PATH # Swift on Linux for cross tests diff --git a/build/docker/ubuntu-disco/Dockerfile b/build/docker/ubuntu-disco/Dockerfile index d530a3559..6707079aa 100644 --- a/build/docker/ubuntu-disco/Dockerfile +++ b/build/docker/ubuntu-disco/Dockerfile @@ -254,7 +254,7 @@ RUN apt-get install -y --no-install-recommends \ ruby-bundler # Rust dependencies -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.40.0 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.61.0 -y ENV PATH /root/.cargo/bin:$PATH # Swift on Linux for cross tests diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile index aec9bd32f..34e902e63 100644 --- a/build/docker/ubuntu-xenial/Dockerfile +++ b/build/docker/ubuntu-xenial/Dockerfile @@ -249,7 +249,7 @@ RUN apt-get install -y --no-install-recommends \ ruby-bundler # Rust dependencies -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.40.0 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.61.0 -y # Locale(s) for cpp unit tests RUN apt-get install -y --no-install-recommends \ |