Skip to content

Commit 37c0bd2

Browse files
committed
Auto merge of #153672 - JonathanBrouwer:rollup-I0JFK6s, r=JonathanBrouwer
Rollup of 13 pull requests Successful merges: - rust-lang/rust#149130 (Implement coercions between `&pin (mut|const) T` and `&(mut) T` when `T: Unpin`) - rust-lang/rust#153143 (Allow `./x test` to run tests without doc tests and without benchmarks) - rust-lang/rust#153471 (Refactor `ActiveJobGuard`) - rust-lang/rust#153595 (`QueryLatch` cleanups) - rust-lang/rust#153653 (scalable vector: type renames and simple checks) - rust-lang/rust#152302 (fix: don't suggest replacing `env!("CARGO_BIN_NAME")` with itself) - rust-lang/rust#153283 (feat(rustdoc-json): Add optional support for rkyv (de)serialization) - rust-lang/rust#153479 (Add rationale for intentional potential_query_instability allows) - rust-lang/rust#153533 (Fix LegacyKeyValueFormat report from docker build: miscellaneous) - rust-lang/rust#153600 (add test for proc-macros with custom panic payloads) - rust-lang/rust#153643 (Avoid projection-only suggestions for inherent assoc types) - rust-lang/rust#153657 (triagebot: remove myself from some mention groups) - rust-lang/rust#153659 (Mark an unreachable match arm as such)
2 parents 5950e09 + c3a85f0 commit 37c0bd2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • rustc_public/src/unstable/convert/stable

rustc_public/src/unstable/convert/stable/abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ impl<'tcx> Stable<'tcx> for rustc_abi::BackendRepr {
265265
rustc_abi::BackendRepr::SimdVector { element, count } => {
266266
ValueAbi::Vector { element: element.stable(tables, cx), count }
267267
}
268-
rustc_abi::BackendRepr::ScalableVector { element, count } => {
268+
rustc_abi::BackendRepr::SimdScalableVector { element, count } => {
269269
ValueAbi::ScalableVector { element: element.stable(tables, cx), count }
270270
}
271271
rustc_abi::BackendRepr::Memory { sized } => ValueAbi::Aggregate { sized },

0 commit comments

Comments
 (0)