diff options
| author | bors <bors@rust-lang.org> | 2021-10-25 14:40:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-25 14:40:45 +0000 |
| commit | 84c2a8505dcdfa0e38e05f72066480ea51ba9cbd (patch) | |
| tree | 75ad7b93989f6bc6fdf172205e4360d0222d86b8 | |
| parent | 235d9853d80f93d31b9c4ae044d6f5c4de3e7255 (diff) | |
| parent | 21af58173f71c16c1d8b111e7455982d2932ce69 (diff) | |
Auto merge of #90265 - GuillaumeGomez:rollup-gx3ficp, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #90017 (Add a couple tests for normalize under binder issues) - #90079 (enable `i8mm` target feature on aarch64 and arm) - #90233 (Tooltip overflow) - #90257 (Changed slice.swap documentation for better readability) - #90261 (Move back to linux builder on try builds) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
| -rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/target_features.rs | 3 | ||||
| -rw-r--r-- | library/core/src/slice/mod.rs | 6 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 14 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/overflow-tooltip-information.goml | 8 | ||||
| -rw-r--r-- | src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs | 13 | ||||
| -rw-r--r-- | src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs | 15 |
8 files changed, 48 insertions, 26 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 580120b25a2..407db519d51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -532,16 +532,9 @@ jobs: strategy: matrix: include: - - name: dist-x86_64-apple - env: - SCRIPT: "./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended" - 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" - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - MACOSX_DEPLOYMENT_TARGET: 10.7 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - DIST_REQUIRE_ALL_TOOLS: 1 - os: macos-latest + - name: dist-x86_64-linux + os: ubuntu-latest-xl + env: {} timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: diff --git a/compiler/rustc_codegen_ssa/src/target_features.rs b/compiler/rustc_codegen_ssa/src/target_features.rs index 8d7e9612f47..dbffb266be8 100644 --- a/compiler/rustc_codegen_ssa/src/target_features.rs +++ b/compiler/rustc_codegen_ssa/src/target_features.rs @@ -19,6 +19,7 @@ const ARM_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[ ("crypto", Some(sym::arm_target_feature)), ("aes", Some(sym::arm_target_feature)), ("sha2", Some(sym::arm_target_feature)), + ("i8mm", Some(sym::arm_target_feature)), ("v5te", Some(sym::arm_target_feature)), ("v6", Some(sym::arm_target_feature)), ("v6k", Some(sym::arm_target_feature)), @@ -90,7 +91,7 @@ const AARCH64_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[ // FEAT_FRINTTS ("frintts", Some(sym::aarch64_target_feature)), // FEAT_I8MM - // ("i8mm", Some(sym::aarch64_target_feature)), + ("i8mm", Some(sym::aarch64_target_feature)), // FEAT_F32MM // ("f32mm", Some(sym::aarch64_target_feature)), // FEAT_F64MM diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs index aaa00653b99..a6370a4513b 100644 --- a/library/core/src/slice/mod.rs +++ b/library/core/src/slice/mod.rs @@ -553,9 +553,9 @@ impl<T> [T] { /// # Examples /// /// ``` - /// let mut v = ["a", "b", "c", "d"]; - /// v.swap(1, 3); - /// assert!(v == ["a", "d", "c", "b"]); + /// let mut v = ["a", "b", "c", "d", "e"]; + /// v.swap(2, 4); + /// assert!(v == ["a", "b", "e", "d", "c"]); /// ``` #[stable(feature = "rust1", since = "1.0.0")] #[inline] diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 76ee324302e..fbb3042d0d6 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -672,17 +672,9 @@ jobs: strategy: matrix: include: - - name: dist-x86_64-apple - env: - SCRIPT: ./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended - 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 - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - MACOSX_DEPLOYMENT_TARGET: 10.7 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - DIST_REQUIRE_ALL_TOOLS: 1 - <<: *job-macos-xl - + - &dist-x86_64-linux + name: dist-x86_64-linux + <<: *job-linux-xl master: name: master diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 6c908a21c39..4e4dd21120f 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -532,7 +532,7 @@ nav.sub { position: relative; } -.docblock > * { +.docblock > :not(.information) { max-width: 100%; overflow-x: auto; } diff --git a/src/test/rustdoc-gui/overflow-tooltip-information.goml b/src/test/rustdoc-gui/overflow-tooltip-information.goml new file mode 100644 index 00000000000..7ef85a4c445 --- /dev/null +++ b/src/test/rustdoc-gui/overflow-tooltip-information.goml @@ -0,0 +1,8 @@ +// The goal of this test is to ensure that the tooltip `.information` class doesn't +// have overflow and max-width CSS rules set because they create a bug in firefox on +// mac. For more information: https://github.com/rust-lang/rust/issues/89185 +goto: file://|DOC_PATH|/test_docs/fn.foo.html +assert-css: (".docblock > .information", { + "overflow-x": "visible", + "max-width": "none" +}, ALL) diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs b/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs new file mode 100644 index 00000000000..768d1c36619 --- /dev/null +++ b/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-56556.rs @@ -0,0 +1,13 @@ +// check-pass + +fn foo<T>(t: T) -> usize +where + for<'a> &'a T: IntoIterator, + for<'a> <&'a T as IntoIterator>::IntoIter: ExactSizeIterator, +{ + t.into_iter().len() +} + +fn main() { + foo::<Vec<u32>>(vec![]); +} diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs b/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs new file mode 100644 index 00000000000..583470080a2 --- /dev/null +++ b/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-76956.rs @@ -0,0 +1,15 @@ +// check-pass + +use std::ops::Deref; + +struct Data { + boxed: Box<&'static i32> +} + +impl Data { + fn use_data(&self, user: impl for <'a> FnOnce(<Box<&'a i32> as Deref>::Target)) { + user(*self.boxed) + } +} + +fn main() {} |
