Skip to content

Commit

Permalink
Rollup merge of rust-lang#82404 - nagisa:nagisa/hexagon-enums-llvm-co…
Browse files Browse the repository at this point in the history
…mps, r=petrochenkov

Test hexagon-enum only when llvm target is present

See rust-lang#82379 (comment)

r? ```@petrochenkov```

```@bors``` rollup
  • Loading branch information
JohnTitor authored Feb 24, 2021
2 parents 761efcf + 24c23f5 commit 2fb67e0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/test/ui/layout/hexagon-enum.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// compile-flags: --target hexagon-unknown-linux-musl
// needs-llvm-components: hexagon
//
// Verify that the hexagon targets implement the repr(C) for enums correctly.
//
Expand Down
10 changes: 5 additions & 5 deletions src/test/ui/layout/hexagon-enum.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ error: layout_of(A) = Layout {
raw: 1,
},
}
--> $DIR/hexagon-enum.rs:15:1
--> $DIR/hexagon-enum.rs:16:1
|
LL | enum A { Apple }
| ^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -169,7 +169,7 @@ error: layout_of(B) = Layout {
raw: 1,
},
}
--> $DIR/hexagon-enum.rs:19:1
--> $DIR/hexagon-enum.rs:20:1
|
LL | enum B { Banana = 255, }
| ^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -257,7 +257,7 @@ error: layout_of(C) = Layout {
raw: 2,
},
}
--> $DIR/hexagon-enum.rs:23:1
--> $DIR/hexagon-enum.rs:24:1
|
LL | enum C { Chaenomeles = 256, }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -345,7 +345,7 @@ error: layout_of(P) = Layout {
raw: 4,
},
}
--> $DIR/hexagon-enum.rs:27:1
--> $DIR/hexagon-enum.rs:28:1
|
LL | enum P { Peach = 0x1000_0000isize, }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -433,7 +433,7 @@ error: layout_of(T) = Layout {
raw: 4,
},
}
--> $DIR/hexagon-enum.rs:33:1
--> $DIR/hexagon-enum.rs:34:1
|
LL | enum T { Tangerine = TANGERINE as isize }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 2fb67e0

Please sign in to comment.