Skip to content

Commit 9484c8a

Browse files
cargo-cyclonedx: fix rustc 1.90 error
1 parent 89c2b23 commit 9484c8a

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/cyclonedx-bom-macros/tests/ui/fail/duplicated_struct.stderr b/cyclonedx-bom-macros/tests/ui/fail/duplicated_struct.stderr
2+
index 0ea1b86..ca80650 100644
3+
--- a/cyclonedx-bom-macros/tests/ui/fail/duplicated_struct.stderr
4+
+++ b/cyclonedx-bom-macros/tests/ui/fail/duplicated_struct.stderr
5+
@@ -1,7 +1,7 @@
6+
error[E0428]: the name `Foo` is defined multiple times
7+
- --> $DIR/duplicated_struct.rs:10:5
8+
- |
9+
-7 | pub struct Foo;
10+
+ --> tests/ui/fail/duplicated_struct.rs:10:5
11+
+ |
12+
+ 7 | pub struct Foo;
13+
| --------------- previous definition of the type `Foo` here
14+
...
15+
10 | pub struct Foo;

pkgs/by-name/ca/cargo-cyclonedx/package.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
2121

2222
cargoHash = "sha256-deczbMPeJsnmXbVB60stKhJJZRIIwjY5vExS3x3b6aU=";
2323

24+
# fixes an error formatting regression introduced with rust 1.90
25+
patches = [ ./fix-expected-test-result.patch ];
26+
2427
nativeBuildInputs = [
2528
pkg-config
2629
];

0 commit comments

Comments
 (0)