This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 181d900 THRIFT 4536: Rust 1.34.0
new e26269e Merge pull request #1781 from dbcfd/4536-rust-stable
181d900 is described below
commit 181d900a396a199083bf9e06da16214b720aacbc
Author: Danny Browning <[email protected]>
AuthorDate: Mon Apr 15 09:50:24 2019 -0600
THRIFT 4536: Rust 1.34.0
Update dockerfiles to use rust stable, call out required rust version in
breaking changes.
---
CHANGES.md | 1 +
build/docker/ubuntu-bionic/Dockerfile | 6 ++----
build/docker/ubuntu-xenial/Dockerfile | 6 ++----
lib/rs/README.md | 8 ++++++++
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 41434e9..df73121 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,7 @@
- [THRIFT-4725](https://issues.apache.org/jira/browse/THRIFT-4725) - java:
change return type signature of 'process' methods
- [THRIFT-4675](https://issues.apache.org/jira/browse/THRIFT-4675) - js: now
uses node-int64 for 64 bit integer constants
- [THRIFT-4841](https://issues.apache.org/jira/browse/THRIFT-4841) - delphi:
old THTTPTransport is now TMsxmlHTTPTransport
+- [THRIFT-4536](https://issues.apache.org/jira/browse/THRIFT-4536) - rust:
convert from try-from crate to rust stable (1.34+), re-export ordered-float
### Known Issues (Blocker or Critical)
diff --git a/build/docker/ubuntu-bionic/Dockerfile
b/build/docker/ubuntu-bionic/Dockerfile
index aae9747..c8131bb 100644
--- a/build/docker/ubuntu-bionic/Dockerfile
+++ b/build/docker/ubuntu-bionic/Dockerfile
@@ -256,10 +256,8 @@ RUN apt-get install -y --no-install-recommends \
ruby-dev \
ruby-bundler
-RUN apt-get install -y --no-install-recommends \
-`# Rust dependencies` \
- cargo \
- rustc
+# Rust dependencies
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
# Swift on Linux for cross tests
RUN cd / && \
diff --git a/build/docker/ubuntu-xenial/Dockerfile
b/build/docker/ubuntu-xenial/Dockerfile
index e6069f8..97aaaea 100644
--- a/build/docker/ubuntu-xenial/Dockerfile
+++ b/build/docker/ubuntu-xenial/Dockerfile
@@ -254,10 +254,8 @@ RUN apt-get install -y --no-install-recommends \
ruby-dev \
ruby-bundler
-RUN apt-get install -y --no-install-recommends \
-`# Rust dependencies` \
- cargo \
- rustc
+# Rust dependencies
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
# Clean up
RUN rm -rf /var/cache/apt/* && \
diff --git a/lib/rs/README.md b/lib/rs/README.md
index 7c37a10..c8d3643 100644
--- a/lib/rs/README.md
+++ b/lib/rs/README.md
@@ -46,6 +46,14 @@ It does not currently use any Rust 2018 features.
Breaking changes are minimized. When they are made they will be outlined below
with transition guidelines.
+##### Thrift 0.13.0
+* **[THRIFT-4536]** - Use TryFrom from std, required rust 1.34.0 or higher
+
+ Previously TryFrom was from try_from crate, it is now from the std library,
+ but this functionality is only available in rust 1.34.0. Additionally,
+ ordered-float is now re-exported under the thrift module to reduce
+ possible dependency mismatches.
+
##### Thrift 0.12.0
* **[THRIFT-4529]** - Rust enum variants are now camel-cased instead of
uppercased to conform to Rust naming conventions
