tink-testing-server: regenerate code from protos

With `export PROTOC=/usr/bin/protoc; cargo build The current version of `tonic-build` needs 2021 edition (because it assumes `TryInto` is in the prelude) so move to that for this crate. Mark the top-level workspace as still using resolver = 1.
project-oak · Oct 2, 2024 · 589fb1d · 589fb1d
1 parent c59ed84
commit 589fb1d
Show file tree

Hide file tree

Showing 3 changed files with 1,397 additions and 661 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,6 +25,7 @@ members = [
   "tests",
   "testing",
 ]
+resolver = "1"
 
 # Patch dependencies on tink crates so that they refer to the versions within this same repository.
 [patch.crates-io]

diff --git a/testing/Cargo.toml b/testing/Cargo.toml
@@ -2,7 +2,7 @@
 name = "tink-testing-server"
 version = "0.2.5"
 authors = ["David Drysdale <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "Testing server for Rust port of Google's Tink cryptography library"
 repository = "https://github.com/project-oak/tink-rust"