Merge branch 'rust-1.68'

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/CMakeLists.txt

@@ -408,10 +408,6 @@ if(NOT CMAKE_CROSSCOMPILING)
     COMMAND
       ${CMAKE_COMMAND} -E env
         CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
-        # enable nightly features in the stable release - needed to activate alloc_error_handler.
-        # see src/rust/bitbox02-rust-c/src/lib.rs.
-        # https://github.com/rust-lang/rust/issues/66740
-        RUSTC_BOOTSTRAP=1
         FIRMWARE_VERSION_SHORT=${FIRMWARE_VERSION}
         # only one test thread because of unsafe concurrent access to `SafeData`, `mock_sd()` and `mock_memory()`. Using mutexes instead leads to mutex poisoning and very messy output in case of a unit test failure.
         ${CARGO} test $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:-v> --all-features --target-dir ${RUST_BINARY_DIR}/all-features ${RUST_CARGO_FLAG} -- --nocapture --test-threads 1
@@ -426,10 +422,6 @@ if(NOT CMAKE_CROSSCOMPILING)
     COMMAND
       ${CMAKE_COMMAND} -E env
         CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
-        # enable nightly features in the stable release - needed to activate alloc_error_handler.
-        # see src/rust/bitbox02-rust-c/src/lib.rs.
-        # https://github.com/rust-lang/rust/issues/66740
-        RUSTC_BOOTSTRAP=1
         FIRMWARE_VERSION_SHORT=${FIRMWARE_VERSION}
         ${CARGO} clippy
           $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:-v>
@@ -505,10 +497,6 @@ foreach(type ${RUST_LIBS})
       ${CMAKE_COMMAND} -E env
       CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
       RUSTFLAGS=${RUSTFLAGS}
-      # enable nightly features in the stable release - needed to activate alloc_error_handler.
-      # see src/rust/bitbox02-rust-c/src/lib.rs.
-      # https://github.com/rust-lang/rust/issues/66740
-      RUSTC_BOOTSTRAP=1
       FIRMWARE_VERSION_SHORT=${FIRMWARE_VERSION}
       ${CARGO} build $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:-v> --features target-${type} --target-dir ${RUST_BINARY_DIR}/feature-${type} ${RUST_CARGO_FLAG} ${RUST_TARGET_ARCH_ARG}
     COMMAND
@@ -532,10 +520,6 @@ if(CMAKE_CROSSCOMPILING)
   add_custom_target(rust-docs
     COMMAND
       ${CMAKE_COMMAND} -E env
-      # enable nightly features in the stable release - needed to activate alloc_error_handler.
-      # see src/rust/bitbox02-rust-c/src/lib.rs.
-      # https://github.com/rust-lang/rust/issues/66740
-      RUSTC_BOOTSTRAP=1
       FIRMWARE_VERSION_SHORT=${FIRMWARE_VERSION}
       CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
       SYSROOT=${CMAKE_SYSROOT}

src/rust/bitbox02-rust-c/src/alloc.rs

@@ -12,14 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[alloc_error_handler]
-#[cfg(not(test))]
-#[cfg(not(feature = "testing"))]
-// Function name is arbitrary.
-fn bitbox02_alloc_error_handler(layout: core::alloc::Layout) -> ! {
-    panic!("memory allocation of {} bytes failed", layout.size())
-}
-
 struct BB02Allocator;
 
 extern "C" {

src/rust/bitbox02-rust-c/src/lib.rs

@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #![no_std]
-#![feature(alloc_error_handler)] // used in alloc.rs
-#![feature(lang_items)]
 
 #[cfg(test)]
 #[macro_use]

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