Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Experiment: Try out workaround for dist-x86_64-linux-alt failure. #107259

Closed
wants to merge 3 commits into from
Closed

Experiment: Try out workaround for dist-x86_64-linux-alt failure. #107259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01d15b4
Allow to disable auto and blanket trait impls retrieval in rustdoc if…
GuillaumeGomez Jan 20, 2023
809eec5
Enable --cfg=parallel_compiler in rustdoc.
m-ou-se Jan 24, 2023
ecda0cc
Temprarily enable dist-x86_64-linux-alt builder for PR.
m-ou-se Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,10 @@ jobs:
strategy:
matrix:
include:
- name: mingw-check
tidy: false
os: ubuntu-20.04-xl
env: {}
- name: mingw-check-tidy
tidy: true
os: ubuntu-20.04-xl
env: {}
- name: x86_64-gnu-llvm-13
tidy: false
os: ubuntu-20.04-xl
env: {}
- name: x86_64-gnu-tools
tidy: false
- name: dist-x86_64-linux-alt
env:
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
IMAGE: dist-x86_64-linux
tidy: false
os: ubuntu-20.04-xl
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
Expand Down Expand Up @@ -248,10 +236,6 @@ jobs:
- name: dist-x86_64-linux
os: ubuntu-20.04-xl
env: {}
- name: dist-x86_64-linux-alt
env:
IMAGE: dist-x86_64-linux
os: ubuntu-20.04-xl
- name: dist-x86_64-musl
os: ubuntu-20.04-xl
env: {}
Expand Down
6 changes: 5 additions & 1 deletion src/bootstrap/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ impl Step for Rustdoc {
features.push("jemalloc".to_string());
}

let cargo = prepare_tool_cargo(
let mut cargo = prepare_tool_cargo(
builder,
build_compiler,
Mode::ToolRustc,
Expand All @@ -562,6 +562,10 @@ impl Step for Rustdoc {
features.as_slice(),
);

if builder.config.rustc_parallel {
cargo.rustflag("--cfg=parallel_compiler");
}

builder.info(&format!(
"Building rustdoc for stage{} ({})",
target_compiler.stage, target_compiler.host
Expand Down
23 changes: 3 additions & 20 deletions src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,23 +291,11 @@ jobs:
strategy:
matrix:
include:
- name: mingw-check
<<: *job-linux-xl
tidy: false

- name: mingw-check-tidy
<<: *job-linux-xl
tidy: true

- name: x86_64-gnu-llvm-13
<<: *job-linux-xl
tidy: false

- name: x86_64-gnu-tools
- name: dist-x86_64-linux-alt
env:
IMAGE: dist-x86_64-linux
<<: *job-linux-xl
tidy: false
env:
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1

auto:
permissions:
Expand Down Expand Up @@ -397,11 +385,6 @@ jobs:
name: dist-x86_64-linux
<<: *job-linux-xl

- name: dist-x86_64-linux-alt
env:
IMAGE: dist-x86_64-linux
<<: *job-linux-xl

- name: dist-x86_64-musl
<<: *job-linux-xl

Expand Down
28 changes: 17 additions & 11 deletions src/librustdoc/clean/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,17 +475,23 @@ pub(crate) fn get_auto_trait_and_blanket_impls(
cx: &mut DocContext<'_>,
item_def_id: DefId,
) -> impl Iterator<Item = Item> {
let auto_impls = cx
.sess()
.prof
.generic_activity("get_auto_trait_impls")
.run(|| AutoTraitFinder::new(cx).get_auto_trait_impls(item_def_id));
let blanket_impls = cx
.sess()
.prof
.generic_activity("get_blanket_impls")
.run(|| BlanketImplFinder { cx }.get_blanket_impls(item_def_id));
auto_impls.into_iter().chain(blanket_impls)
// FIXME: To be removed once `parallel_compiler` bugs are fixed!
// More information in <https://github.com/rust-lang/rust/pull/106745>.
if !cfg!(parallel_compiler) {
let auto_impls = cx
.sess()
.prof
.generic_activity("get_auto_trait_impls")
.run(|| AutoTraitFinder::new(cx).get_auto_trait_impls(item_def_id));
let blanket_impls = cx
.sess()
.prof
.generic_activity("get_blanket_impls")
.run(|| BlanketImplFinder { cx }.get_blanket_impls(item_def_id));
auto_impls.into_iter().chain(blanket_impls)
} else {
vec![].into_iter().chain(vec![].into_iter())
}
}

/// If `res` has a documentation page associated, store it in the cache.
Expand Down