Skip to content

Commit 84c2a85

Browse files
committed
Auto merge of rust-lang#90265 - GuillaumeGomez:rollup-gx3ficp, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - rust-lang#90017 (Add a couple tests for normalize under binder issues) - rust-lang#90079 (enable `i8mm` target feature on aarch64 and arm) - rust-lang#90233 (Tooltip overflow) - rust-lang#90257 (Changed slice.swap documentation for better readability) - rust-lang#90261 (Move back to linux builder on try builds) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 235d985 + 21af581 commit 84c2a85

File tree

8 files changed

+48
-26
lines changed

8 files changed

+48
-26
lines changed

Diff for: .github/workflows/ci.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -532,16 +532,9 @@ jobs:
532532
strategy:
533533
matrix:
534534
include:
535-
- name: dist-x86_64-apple
536-
env:
537-
SCRIPT: "./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended"
538-
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
539-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
540-
MACOSX_DEPLOYMENT_TARGET: 10.7
541-
NO_LLVM_ASSERTIONS: 1
542-
NO_DEBUG_ASSERTIONS: 1
543-
DIST_REQUIRE_ALL_TOOLS: 1
544-
os: macos-latest
535+
- name: dist-x86_64-linux
536+
os: ubuntu-latest-xl
537+
env: {}
545538
timeout-minutes: 600
546539
runs-on: "${{ matrix.os }}"
547540
steps:

Diff for: compiler/rustc_codegen_ssa/src/target_features.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const ARM_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
1919
("crypto", Some(sym::arm_target_feature)),
2020
("aes", Some(sym::arm_target_feature)),
2121
("sha2", Some(sym::arm_target_feature)),
22+
("i8mm", Some(sym::arm_target_feature)),
2223
("v5te", Some(sym::arm_target_feature)),
2324
("v6", Some(sym::arm_target_feature)),
2425
("v6k", Some(sym::arm_target_feature)),
@@ -90,7 +91,7 @@ const AARCH64_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
9091
// FEAT_FRINTTS
9192
("frintts", Some(sym::aarch64_target_feature)),
9293
// FEAT_I8MM
93-
// ("i8mm", Some(sym::aarch64_target_feature)),
94+
("i8mm", Some(sym::aarch64_target_feature)),
9495
// FEAT_F32MM
9596
// ("f32mm", Some(sym::aarch64_target_feature)),
9697
// FEAT_F64MM

Diff for: library/core/src/slice/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,9 @@ impl<T> [T] {
553553
/// # Examples
554554
///
555555
/// ```
556-
/// let mut v = ["a", "b", "c", "d"];
557-
/// v.swap(1, 3);
558-
/// assert!(v == ["a", "d", "c", "b"]);
556+
/// let mut v = ["a", "b", "c", "d", "e"];
557+
/// v.swap(2, 4);
558+
/// assert!(v == ["a", "b", "e", "d", "c"]);
559559
/// ```
560560
#[stable(feature = "rust1", since = "1.0.0")]
561561
#[inline]

Diff for: src/ci/github-actions/ci.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -672,17 +672,9 @@ jobs:
672672
strategy:
673673
matrix:
674674
include:
675-
- name: dist-x86_64-apple
676-
env:
677-
SCRIPT: ./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended
678-
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
679-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
680-
MACOSX_DEPLOYMENT_TARGET: 10.7
681-
NO_LLVM_ASSERTIONS: 1
682-
NO_DEBUG_ASSERTIONS: 1
683-
DIST_REQUIRE_ALL_TOOLS: 1
684-
<<: *job-macos-xl
685-
675+
- &dist-x86_64-linux
676+
name: dist-x86_64-linux
677+
<<: *job-linux-xl
686678

687679
master:
688680
name: master

Diff for: src/librustdoc/html/static/css/rustdoc.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ nav.sub {
532532
position: relative;
533533
}
534534

535-
.docblock > * {
535+
.docblock > :not(.information) {
536536
max-width: 100%;
537537
overflow-x: auto;
538538
}
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// The goal of this test is to ensure that the tooltip `.information` class doesn't
2+
// have overflow and max-width CSS rules set because they create a bug in firefox on
3+
// mac. For more information: https://github.com/rust-lang/rust/issues/89185
4+
goto: file://|DOC_PATH|/test_docs/fn.foo.html
5+
assert-css: (".docblock > .information", {
6+
"overflow-x": "visible",
7+
"max-width": "none"
8+
}, ALL)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// check-pass
2+
3+
fn foo<T>(t: T) -> usize
4+
where
5+
for<'a> &'a T: IntoIterator,
6+
for<'a> <&'a T as IntoIterator>::IntoIter: ExactSizeIterator,
7+
{
8+
t.into_iter().len()
9+
}
10+
11+
fn main() {
12+
foo::<Vec<u32>>(vec![]);
13+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// check-pass
2+
3+
use std::ops::Deref;
4+
5+
struct Data {
6+
boxed: Box<&'static i32>
7+
}
8+
9+
impl Data {
10+
fn use_data(&self, user: impl for <'a> FnOnce(<Box<&'a i32> as Deref>::Target)) {
11+
user(*self.boxed)
12+
}
13+
}
14+
15+
fn main() {}

0 commit comments

Comments
 (0)