rust: update toolchain to 1.68.0

Renamed our prost-build tool to prost-build-proto, as "prost-build"
the binary tool crate, but also depends on a library crate by the same
name, which confuses Rust 1.68.0. This rename disambiguates the two.

types.rs change is fixing a new Clippy warning.

Author: benma

.ci/run-container-ci

@@ -25,7 +25,7 @@
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:31
+CONTAINER=shiftcrypto/firmware_v2:32
 
 if [ "$1" == "pull" ] ; then
 	docker pull "$CONTAINER"

Dockerfile

@@ -132,8 +132,8 @@ RUN rustup component add clippy
 RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.24.3
 RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.64.0
 
-COPY tools/prost-build prost-build
-RUN CARGO_HOME=/opt/cargo cargo install --path prost-build --locked
+COPY tools/prost-build-proto prost-build-proto
+RUN CARGO_HOME=/opt/cargo cargo install --path prost-build-proto --locked
 
 # Clean temporary files to reduce image size
 RUN rm -rf /var/lib/apt/lists/*

messages/CMakeLists.txt

@@ -19,7 +19,7 @@ foreach(i ${PROTO_FILES})
   list(APPEND PROTO_FILES_ABSOLUTE "${CMAKE_CURRENT_SOURCE_DIR}/${i}")
 endforeach()
 
-find_program(PROST_BUILD prost-build)
+find_program(PROST_BUILD prost-build-proto)
 
 set(OUTPUT_FILES
   ${CMAKE_SOURCE_DIR}/src/rust/bitbox02-rust/src/shiftcrypto.bitbox02.rs

src/rust/bitbox02/src/ui/types.rs

@@ -23,7 +23,9 @@ pub use bitbox02_sys::trinary_choice_t as TrinaryChoice;
 #[cfg_attr(feature = "testing", allow(dead_code))]
 pub(crate) const MAX_LABEL_SIZE: usize = bitbox02_sys::MAX_LABEL_SIZE as _;
 
+#[derive(Default)]
 pub enum Font {
+    #[default]
     Default,
     Password11X12,
     Monogram5X9,
@@ -40,12 +42,6 @@ impl Font {
     }
 }
 
-impl Default for Font {
-    fn default() -> Self {
-        Font::Default
-    }
-}
-
 #[derive(Default)]
 pub struct ConfirmParams<'a> {
     /// The confirmation title of the screen. Max 200 chars, otherwise **panic**.

src/rust/rust-toolchain

@@ -1 +1 @@
-1.67.1
+1.68.0