tink-testing-server: regenerate code from protos

daviddrysdale · daviddrysdale · commit 329e2214efa7 · 2024-10-02T16:44:40.000+01:00
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.
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 <drysdale@google.com>"]
-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"
diff --git a/testing/src/codegen/tink_testing_api.rs b/testing/src/codegen/tink_testing_api.rs

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ members = [`
`25`	`25`	`"tests",`
`26`	`26`	`"testing",`
`27`	`27`	`]`
	`28`	`+resolver = "1"`
`28`	`29`
`29`	`30`	`# Patch dependencies on tink crates so that they refer to the versions within this same repository.`
`30`	`31`	`[patch.crates-io]`