Merge remote-tracking branch 'upstream/rust'

Author: benma

.containerversion

@@ -1 +1 @@
-49
+50

.gitignore

@@ -22,10 +22,3 @@ compile_flags.txt
 bitbox02.egg-info
 /py/bitbox02/build
 /py/bitbox02/dist
-
-# Git backup files created on merge conflicts
-*_BACKUP_*
-*_BASE_*
-*_LOCAL_*
-*_REMOTE_*
-*.orig

Dockerfile

@@ -19,7 +19,7 @@
 # $ docker run --privileged --rm tonistiigi/binfmt --install arm64
 
 FROM ubuntu:22.04
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # These are automatically provided by docker (no need for --build-arg)
 ARG TARGETPLATFORM
@@ -117,7 +117,7 @@ RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
     curl -L0 ${PROTOC_URL} -o /tmp/protoc-21.2.zip && \
     unzip /tmp/protoc-21.2.zip -d /opt/protoc && \
     rm /tmp/protoc-21.2.zip
-ENV PATH /opt/protoc/bin:$PATH
+ENV PATH=/opt/protoc/bin:$PATH
 
 # Make Python3 the default
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
@@ -129,18 +129,18 @@ RUN apt-get update && apt-get install -y \
 RUN python3 -m pip install gcovr
 
 # Install Go, used for the tools in tools/go and for test/gounittest
-ENV GOPATH /opt/go
-ENV GOROOT /opt/go_dist/go
-ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
+ENV GOPATH=/opt/go
+ENV GOROOT=/opt/go_dist/go
+ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH
 RUN mkdir -p /opt/go_dist && \
     curl https://dl.google.com/go/go1.19.3.linux-${TARGETARCH}.tar.gz | tar -xz -C /opt/go_dist
 
 # Install lcov from release (the one from the repos is too old).
 RUN cd /opt && wget https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz && tar -xf lcov-1.14.tar.gz
-ENV PATH /opt/lcov-1.14/bin:$PATH
+ENV PATH=/opt/lcov-1.14/bin:$PATH
 
 # Install rust compiler
-ENV PATH /opt/cargo/bin:$PATH
+ENV PATH=/opt/cargo/bin:$PATH
 ENV RUSTUP_HOME=/opt/rustup
 COPY src/rust/rust-toolchain.toml /tmp/rust-toolchain.toml
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --default-toolchain $(grep -oP '(?<=channel = ")[^"]+' /tmp/rust-toolchain.toml) -y

Makefile

@@ -173,7 +173,7 @@ run-bootloader:
 run-factory-setup-debug:
 	arm-none-eabi-gdb -x scripts/jlink.gdb build-debug/bin/factory-setup.elf
 dockerinit:
-	./scripts/container.sh build --pull --force-rm --no-cache -t shiftcrypto/firmware_v2:$(shell cat .containerversion) .
+	./scripts/container.sh build --pull -t shiftcrypto/firmware_v2:$(shell cat .containerversion) .
 dockerpull:
 	./scripts/container.sh pull shiftcrypto/firmware_v2:$(shell cat .containerversion)
 dockerdev:

external/vendor/addr2line/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"0d04c7dddcffba3d83d4a05466c9b79cf13360c33f081fc9800596716bf954ce","Cargo.lock":"783a3adbf5047e30e0aa52f28dc6a0134534de715e5a36fd402c17e2eba43b1a","Cargo.toml":"940373297f67456852d5236a1eb7a3856bc672c69529cbbe6052ce5f85221170","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"e99d88d232bf57d70f0fb87f6b496d44b6653f99f8a63d250a54c61ea4bcde40","README.md":"c635ed91d7b0c87ff2f0f311cd1a31336d2cbc4d011965d3b58afaca073538d9","src/bin/addr2line.rs":"3da8c7657604578961f2bf89052b94e6c59c55abe27a2707913f98875d666124","src/frame.rs":"de3b23388c36a0874db5569d1f49ce6cc52ef2006b9ae9b9a3eba7654b201e2b","src/function.rs":"7fc741622c44c24fdf54c8a44cbdee058d49da33974bc86cd45b70c143071e68","src/lazy.rs":"ec230b69a0d194fe253227a41903231ca70a88f896af7a6f8a5a7d9ac63bf618","src/lib.rs":"8bf9fe3f3ced8ff84d60fdd456a8ff6e73170825cd696b0291b4644c01e620d2","src/line.rs":"049e9b1526ae3433a6001e8377245131e9cbd056d17e67a9b34898598a4f1c28","src/loader.rs":"9ad08da02599b9742a9821742fd84dbe0294838b6faa5f5753eacddc6101ffc1","src/lookup.rs":"0d28a2fd00f0696f8fb50cdc88cb7d55a910df8bf3052b7c74ae50a387346e67","src/unit.rs":"f4399c401759e14db5d596cfddfe2c8a0591a81c18d9adaedba7d243cc3bd192"},"package":"dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"}
+{"files":{".cargo_vcs_info.json":"61ea40c74a8ba6ecd523f8584b5e52454b0473bbb112e7cf4dce3d4d0f4f253a","CHANGELOG.md":"dc96b6ac3a534d948a55d17bf0144522e26cb6afaeafd79c3533b4988616ffea","Cargo.lock":"a5a5ca765a6f630c80e32310ffa92185a2805c7c364c07479bf2799524561807","Cargo.toml":"915a5053f0fe3a27a6e34a6f35e789ee09ac3bf3a7c4d07a62d68acd1d821104","Cargo.toml.orig":"fce3df826fb5d4229b290467e48252f8da5124213d5b8a5b1e7f0e953b01eef9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"e99d88d232bf57d70f0fb87f6b496d44b6653f99f8a63d250a54c61ea4bcde40","README.md":"c635ed91d7b0c87ff2f0f311cd1a31336d2cbc4d011965d3b58afaca073538d9","src/bin/addr2line.rs":"147c07d761c845c5faf3e1e3904c33374bc84bc79b2b95ae892b1def5ce6ced6","src/frame.rs":"de3b23388c36a0874db5569d1f49ce6cc52ef2006b9ae9b9a3eba7654b201e2b","src/function.rs":"6e0aceeb826db8fcec78376ee72b5dca098ae3e409e9defc5f1af9bfb2c7f173","src/lib.rs":"0baa05211611d9d79c3162a3e59f2cfe3334a71bece99bb337a7a2326a93093e","src/line.rs":"374afffcd11e38dc1b093d38b16b42d33c2a5fa9e7dbb759ecf15c1f6c58a7a0","src/loader.rs":"10ce28775d65bb32ed2995fae240b4f38499a80b56cdf17c079d166c9f1153f3","src/lookup.rs":"0d28a2fd00f0696f8fb50cdc88cb7d55a910df8bf3052b7c74ae50a387346e67","src/unit.rs":"5f2035954d86aa8dcb4d552ee8fb93c7f792d9fa2b6aeafa62f78b066363c8f5"},"package":"9acbfca36652500c911ddb767ed433e3ed99b032b5d935be73c6923662db1d43"}

external/vendor/addr2line/.cargo_vcs_info.json

@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "2f260d1f4e36cc658fd2e1502bc0d65309cddb2c"
+  },
+  "path_in_vcs": ""
+}

external/vendor/addr2line/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 --------------------------------------------------------------------------------
 
+## 0.25.0 (2025/06/11)
+
+### Breaking changes
+
+* Updated `gimli` dependency.
+
+### Added
+
+* Added `Loader::find_symbol`.
+  [#341](https://github.com/gimli-rs/addr2line/pull/341)
+  [#349](https://github.com/gimli-rs/addr2line/pull/349)
+
+* Added `Loader::get_section_range`.
+  Added `--section` option to `addr2line` binary.
+  [#343](https://github.com/gimli-rs/addr2line/pull/343)
+
+* Added `wasm` feature.
+  [#348](https://github.com/gimli-rs/addr2line/pull/348)
+
+### Changed
+
+* Fixed handling of Windows paths that use forward slashes.
+  [#342](https://github.com/gimli-rs/addr2line/pull/342)
+
+* Removed `compiler-builtins` from `rustc-dep-of-std` dependencies.
+  [#345](https://github.com/gimli-rs/addr2line/pull/345)
+
+--------------------------------------------------------------------------------
+
 ## 0.24.2 (2024/10/04)
 
 ### Changed