From: Yash Shinde <[email protected]>
Update the file paths for v1.77 and fix the dead code error as follows:
Compiling coverage-dump v0.1.0
(/home/poky/build-st/tmp/work/core2-64-poky-linux/rust/1.77.0/rustc-1.77.0-src/src/tools/coverage-dump)
error: field `0` is never read
--> src/tools/coverage-dump/src/covfun.rs:222:15
|
222 | Expansion(u32),
| --------- ^^^
| |
| field in this variant
|
= note: `-D dead-code` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(dead_code)]`
help: consider changing the field to be of unit type to suppress this
warning while preserving the field numbering, or remove the field
|
222 | Expansion(()),
| ~~
error: could not compile `coverage-dump` (bin "coverage-dump") due to 1
previous error
Only the required change is backported here to run the build without any
errors.
Other changes are merged with the commit in v1.78.
Reference:
https://github.com/rust-lang/rust/commit/9a5034a20ed8b055dc615271f9d9cf27f9e494f0#diff-d4ecc6273352a2a8ebd02c45233d9bff7c6694f20b67ddad0614af7a89c06748
Signed-off-by: Yash Shinde <[email protected]>
---
.../rust/files/rust-oe-selftest.patch | 29 +++++++++++++++++--
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/rust/files/rust-oe-selftest.patch
b/meta/recipes-devtools/rust/files/rust-oe-selftest.patch
index 0280b1ef8c..dbdf39f9d3 100644
--- a/meta/recipes-devtools/rust/files/rust-oe-selftest.patch
+++ b/meta/recipes-devtools/rust/files/rust-oe-selftest.patch
@@ -279,10 +279,10 @@ index 1a9d3d3f12f..0a9cfc48806 100644
fn test_get_mut_poison() {
let m = Arc::new(RwLock::new(NonCopy(10)));
let m2 = m.clone();
-diff --git a/library/std/src/sys/unix/process/process_unix/tests.rs
b/library/std/src/sys/unix/process/process_unix/tests.rs
+diff --git a/library/std/src/sys/pal/unix/process/process_unix/tests.rs
b/library/std/src/sys/pal/unix/process/process_unix/tests.rs
index 0a6c6ec19fc..bec257bc630 100644
---- a/library/std/src/sys/unix/process/process_unix/tests.rs
-+++ b/library/std/src/sys/unix/process/process_unix/tests.rs
+--- a/library/std/src/sys/pal/unix/process/process_unix/tests.rs
++++ b/library/std/src/sys/pal/unix/process/process_unix/tests.rs
@@ -6,6 +6,7 @@
// safety etc., are tested in tests/ui/process/process-panic-after-fork.rs
@@ -343,3 +343,26 @@ index 5d6b9e94ee9..a5aacb2eb87 100644
fn test_try_panic_any_message_unit_struct() {
struct Juju;
+diff --git a/library/alloc/src/slice/tests.rs
b/library/alloc/src/slice/tests.rs
+--- a/library/alloc/src/slice/tests.rs
++++ b/library/alloc/src/slice/tests.rs
+@@ -186,6 +186,7 @@
+ std::thread_local!(static SILENCE_PANIC: Cell<bool> = Cell::new(false));
+
+ #[test]
++#[ignore]
+ #[cfg_attr(target_os = "emscripten", ignore)] // no threads
+ #[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
+ fn panic_safe() {
+diff --git a/src/tools/coverage-dump/src/covfun.rs
b/src/tools/coverage-dump/src/covfun.rs
+--- a/src/tools/coverage-dump/src/covfun.rs
++++ b/src/tools/coverage-dump/src/covfun.rs
+@@ -219,7 +219,7 @@
+ enum MappingKind {
+ Code(CovTerm),
+ Gap(CovTerm),
+- Expansion(u32),
++ Expansion(#[allow(dead_code)] u32),
+ Skip,
+ // Using raw identifiers here makes the dump output a little bit nicer
+ // (via the derived Debug), at the expense of making this tool's source
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203124):
https://lists.openembedded.org/g/openembedded-core/message/203124
Mute This Topic: https://lists.openembedded.org/mt/107786806/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
