Skip to content

Rollup of 6 pull requests #90235

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

Merged
merged 19 commits into from
Oct 24, 2021
Merged

Rollup of 6 pull requests #90235

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7f79153
write substs for lang item paths
lcnr Oct 5, 2021
80fe0bb
add a `rustc::query_stability` lint
lcnr Oct 5, 2021
00e5abe
allow `potential_query_instability` everywhere
lcnr Oct 13, 2021
9a3c024
Skip documentation for tier 2 targets
Mark-Simulacrum Oct 20, 2021
5503dd9
[do not merge] try build
Mark-Simulacrum Oct 20, 2021
9296efe
Print step timings for try builds
Mark-Simulacrum Oct 21, 2021
22e1798
ignore `potential_query_instability` in rustdoc
lcnr Oct 21, 2021
a288bf6
Mark {array,slice}::{from_ref,from_mut} as const fn
WaffleLapkin Oct 22, 2021
27d6961
Fill tracking issue for `const_slice_from_ref` and `const_array_from_…
WaffleLapkin Oct 23, 2021
542ab2d
Outdent method headings so they stand out
jsha Oct 22, 2021
5f390cf
Add tests for `const_slice_from_ref` and `const_array_from_ref`
WaffleLapkin Oct 23, 2021
4b97023
Fix ICE when forgetting to `Box` a parameter to a `Self::func` call
JakobDegen Oct 24, 2021
aacb497
Temporarily turn overflow checks off for rustc-rayon-core
hkratz Oct 24, 2021
87822b2
Rollup merge of #89558 - lcnr:query-stable-lint, r=estebank
matthiaskrgr Oct 24, 2021
d814af9
Rollup merge of #90100 - Mark-Simulacrum:speed-macos-ci, r=pietroalbini
matthiaskrgr Oct 24, 2021
b837605
Rollup merge of #90155 - jsha:outdent-methods, r=GuillaumeGomez,camelid
matthiaskrgr Oct 24, 2021
c16ee19
Rollup merge of #90162 - WaffleLapkin:const_array_slice_from_ref_mut,…
matthiaskrgr Oct 24, 2021
d576393
Rollup merge of #90221 - JakobDegen:issue-90213, r=cjgillot
matthiaskrgr Oct 24, 2021
eee29fd
Rollup merge of #90234 - rusticstuff:rustc-rayon-core-no-overflow-che…
matthiaskrgr Oct 24, 2021
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
15 changes: 11 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ jobs:
os: ubuntu-latest-xl
- name: dist-x86_64-apple
env:
SCRIPT: "./x.py dist"
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
Expand Down Expand Up @@ -532,9 +532,16 @@ jobs:
strategy:
matrix:
include:
- name: dist-x86_64-linux
os: ubuntu-latest-xl
env: {}
- 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
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
steps:
Expand Down
16 changes: 14 additions & 2 deletions src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,9 +448,11 @@ jobs:
# macOS Builders #
####################

# Only generate documentation for x86_64-apple-darwin, not other
# tier 2 targets produced by this builder.
- name: dist-x86_64-apple
env:
SCRIPT: ./x.py dist
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
Expand Down Expand Up @@ -670,7 +672,17 @@ jobs:
strategy:
matrix:
include:
- *dist-x86_64-linux
- 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


master:
name: master
Expand Down
2 changes: 1 addition & 1 deletion src/ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ else
PYTHON="python2"
fi

if ! isCI || isCiBranch auto || isCiBranch beta; then
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"
fi

Expand Down