Skip to content

Commit 409998c

Browse files
committed
Auto merge of rust-lang#134333 - daxpedda:stdarch-bump, r=daxpedda
Bump `stdarch` This bumps `stdarch` to rust-lang/stdarch@684de0d to get in rust-lang/stdarch#1677 (tracked in rust-lang#133908). From the [commit history](rust-lang/stdarch@e5e00aa...684de0d) I deduced that there shouldn't be any changes to Rust necessary. From past PRs I'm assuming that bumping `stdarch` like this is fine, but please let me know if this is somehow inappropriate or requires something more to be done! try-job: arm-android try-job: armhf-gnu
2 parents d53b0ff + 374800b commit 409998c

File tree

4 files changed

+11
-19
lines changed

4 files changed

+11
-19
lines changed

library/portable-simd/crates/core_simd/src/vendor/arm.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,6 @@ mod neon {
4848
from_transmute! { unsafe u64x2 => poly64x2_t }
4949
}
5050

51-
#[cfg(any(
52-
all(target_feature = "v5te", not(target_feature = "mclass")),
53-
all(target_feature = "mclass", target_feature = "dsp"),
54-
))]
55-
mod dsp {
56-
use super::*;
57-
58-
from_transmute! { unsafe Simd<u16, 2> => uint16x2_t }
59-
from_transmute! { unsafe Simd<i16, 2> => int16x2_t }
60-
}
61-
6251
#[cfg(any(
6352
all(target_feature = "v6", not(target_feature = "mclass")),
6453
all(target_feature = "mclass", target_feature = "dsp"),
@@ -68,6 +57,8 @@ mod simd32 {
6857

6958
from_transmute! { unsafe Simd<u8, 4> => uint8x4_t }
7059
from_transmute! { unsafe Simd<i8, 4> => int8x4_t }
60+
from_transmute! { unsafe Simd<u16, 2> => uint16x2_t }
61+
from_transmute! { unsafe Simd<i16, 2> => int16x2_t }
7162
}
7263

7364
#[cfg(all(

library/stdarch

Submodule stdarch updated 47 files

tests/ui/traits/issue-77982.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ ignore-windows different list of satisfying impls
2+
//@ ignore-arm different list of satisfying impls
23
use std::collections::HashMap;
34

45
fn what() {

tests/ui/traits/issue-77982.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0283]: type annotations needed
2-
--> $DIR/issue-77982.rs:9:10
2+
--> $DIR/issue-77982.rs:10:10
33
|
44
LL | opts.get(opt.as_ref());
55
| ^^^ ------------ type must be known at this point
@@ -18,7 +18,7 @@ LL | opts.get::<Q>(opt.as_ref());
1818
| +++++
1919

2020
error[E0283]: type annotations needed
21-
--> $DIR/issue-77982.rs:9:10
21+
--> $DIR/issue-77982.rs:10:10
2222
|
2323
LL | opts.get(opt.as_ref());
2424
| ^^^ ------ type must be known at this point
@@ -36,7 +36,7 @@ LL | opts.get::<Q>(opt.as_ref());
3636
| +++++
3737

3838
error[E0283]: type annotations needed
39-
--> $DIR/issue-77982.rs:14:59
39+
--> $DIR/issue-77982.rs:15:59
4040
|
4141
LL | let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect();
4242
| --- ^^^^
@@ -56,13 +56,13 @@ LL | let ips: Vec<_> = (0..100_000).map(|_| u32::from(<u32 as Into<T>>::into
5656
| +++++++++++++++++++++++ ~
5757

5858
error[E0283]: type annotations needed for `Box<_>`
59-
--> $DIR/issue-77982.rs:37:9
59+
--> $DIR/issue-77982.rs:38:9
6060
|
6161
LL | let _ = ().foo();
6262
| ^ --- type must be known at this point
6363
|
6464
note: multiple `impl`s satisfying `(): Foo<'_, _>` found
65-
--> $DIR/issue-77982.rs:30:1
65+
--> $DIR/issue-77982.rs:31:1
6666
|
6767
LL | impl Foo<'static, u32> for () {}
6868
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -74,13 +74,13 @@ LL | let _: Box<T> = ().foo();
7474
| ++++++++
7575

7676
error[E0283]: type annotations needed for `Box<_>`
77-
--> $DIR/issue-77982.rs:41:9
77+
--> $DIR/issue-77982.rs:42:9
7878
|
7979
LL | let _ = (&()).bar();
8080
| ^ --- type must be known at this point
8181
|
8282
note: multiple `impl`s satisfying `&(): Bar<'_, _>` found
83-
--> $DIR/issue-77982.rs:33:1
83+
--> $DIR/issue-77982.rs:34:1
8484
|
8585
LL | impl<'a> Bar<'static, u32> for &'a () {}
8686
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)