Skip to content

Commit

Permalink
Auto merge of rust-lang#121486 - fmease:rustdoc-demo-unstable-under-r…
Browse files Browse the repository at this point in the history
…meta-changes, r=<try>

[try-only] [demo] rustdoc is unstable under rmeta changes

Part of rust-lang#119597.
  • Loading branch information
bors committed Feb 23, 2024
2 parents a28d221 + 5a6b3a6 commit aae3bdb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,10 @@ jobs:
strategy:
matrix:
include:
- name: dist-x86_64-linux
- name: dist-aarch64-linux
env:
CODEGEN_BACKENDS: "llvm,cranelift"
os: ubuntu-20.04-16core-64gb
os: ubuntu-20.04-8core-32gb
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
steps:
Expand Down
6 changes: 3 additions & 3 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -734,11 +734,11 @@ jobs:
strategy:
matrix:
include:
- &dist-x86_64-linux
name: dist-x86_64-linux
- &dist-aarch64-linux
name: dist-aarch64-linux
env:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-16c
<<: *job-linux-8c


master:
Expand Down
6 changes: 2 additions & 4 deletions tests/rustdoc/synthetic_auto/no-redundancy.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// FIXME(fmease, #119216): Reenable this test!
//@ ignore-test

pub struct Inner<T> {
field: T,
}
Expand All @@ -12,8 +9,9 @@ where
}

// @has no_redundancy/struct.Outer.html
// FIXME(fmease): Reverse the order of bounds again.
// @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \
// "impl<T> Send for Outer<T>where T: Send + Copy"
// "impl<T> Send for Outer<T>where T: Copy + Send"
pub struct Outer<T> {
inner_field: Inner<T>,
}

0 comments on commit aae3bdb

Please sign in to comment.