Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 14 pull requests #77917

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 40 commits into from
Oct 14, 2020
Merged

Rollup of 14 pull requests #77917

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
97beb07
BTreeMap: derive type-specific variants of node_as_mut and cast_unche…
ssomers Oct 3, 2020
e55d27f
Remove unnecessary rustc_const_stable attributes.
m-ou-se Oct 8, 2020
c25f69a
Remove unsafety from unsupported/mutex.rs by using a Cell.
m-ou-se Oct 8, 2020
3d192ac
Remove unsafety from unsupported/rwlosck.rs by using a Cell.
m-ou-se Oct 8, 2020
f4e8842
Apply deny(unsafe_op_in_unsafe_fn) to all of sys/unsupported.
m-ou-se Oct 8, 2020
f1c3edb
Assert state in sys/unsupported's RwLock::write_unlock.
m-ou-se Oct 8, 2020
23c3356
Mention rustdoc in `x.py setup`
jyn514 Oct 10, 2020
d7029cb
`min_const_generics` diagnostics improvements
eopb Oct 11, 2020
eec4436
Make error help clearer
eopb Oct 12, 2020
d909d69
Upgrade OpenSSL to 1.1.1h and add support for aarch64-apple-darwin
shepmaster Oct 12, 2020
5ae5b0e
Enable building Cargo for aarch64-apple-darwin
shepmaster Sep 26, 2020
eb0c996
Configure jemalloc for cross-compilation to aarch64-apple-darwin
shepmaster Sep 27, 2020
e62da8f
Remove a little jargon from error
eopb Oct 12, 2020
facb38d
A little rewording
eopb Oct 12, 2020
c16c8ac
Include `llvm-dis`, `llc` and `opt` in `llvm-tools-preview` component
Aaron1011 Oct 12, 2020
79351b1
Bless expected errors
eopb Oct 12, 2020
61e722f
Use Option::unwrap_or instead of open-coding it
LingMan Oct 12, 2020
45a34fc
Include aarch64-apple-darwin in the dist manifests
shepmaster Oct 13, 2020
a0fc455
Replace absolute paths with relative ones
est31 Oct 13, 2020
b26aa5d
Add note about using cells in the locks on the 'unsupported' platform.
m-ou-se Oct 13, 2020
b7080e6
Give an error when running `x.py test --stage 0 src/test/ui`
jyn514 Oct 10, 2020
8b6e346
aarch64-apple-darwin now includes Cargo
shepmaster Oct 13, 2020
af414dc
Deny unsafe_op_in_unsafe_fn for unsupported/common.rs through sys/was…
m-ou-se Oct 13, 2020
91cc3d2
Add regression issue template
camelid Oct 8, 2020
6091538
bootstrap: set correct path for the build-manifest binary
pietroalbini Oct 13, 2020
7a23a71
Replace trivial bool matches with the `matches!` macro
LingMan Oct 12, 2020
16612a9
Rollup merge of #77239 - shepmaster:silicon-ci-plus, r=pietroalbini
JohnTitor Oct 13, 2020
6a59621
Rollup merge of #77569 - ssomers:btree_cleanup_1, r=Mark-Simulacrum
JohnTitor Oct 13, 2020
7de5fe7
Rollup merge of #77719 - fusion-engineering-forks:const-new-mutex-att…
JohnTitor Oct 13, 2020
cc5a1aa
Rollup merge of #77722 - fusion-engineering-forks:safe-unsupported-lo…
JohnTitor Oct 13, 2020
1bb6eff
Rollup merge of #77725 - camelid:regression-template, r=Mark-Simulacrum
JohnTitor Oct 13, 2020
fe7e794
Rollup merge of #77776 - jyn514:wrong-way, r=Mark-Simulacrum
JohnTitor Oct 13, 2020
ec0cabd
Rollup merge of #77786 - jyn514:rustdoc, r=Mark-Simulacrum
JohnTitor Oct 13, 2020
c44cc7e
Rollup merge of #77825 - ethanboxx:min_const_generics_diagnostic, r=lcnr
JohnTitor Oct 13, 2020
c824787
Rollup merge of #77868 - Aaron1011:llvm-tools-opt-llc, r=Mark-Simulacrum
JohnTitor Oct 13, 2020
31135e0
Rollup merge of #77884 - LingMan:ast_pretty_unwrap_or, r=varkor
JohnTitor Oct 13, 2020
083638c
Rollup merge of #77886 - LingMan:ast_pretty_bool_matches, r=petrochenkov
JohnTitor Oct 13, 2020
70f8e1a
Rollup merge of #77892 - est31:remove_redundant_absolute_paths, r=lcnr
JohnTitor Oct 13, 2020
b24e25d
Rollup merge of #77895 - shepmaster:silicon-manifest, r=pietroalbini
JohnTitor Oct 13, 2020
b4a3b56
Rollup merge of #77909 - pietroalbini:fix-build-manifest-path, r=Mark…
JohnTitor Oct 13, 2020
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,16 @@ jobs:
- name: dist-aarch64-apple
env:
SCRIPT: "./x.py dist --stage 2"
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --tools=rls,clippy,rustfmt,analysis,src"
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
SELECT_XCODE: /Applications/Xcode_12_beta.app
USE_XCODE_CLANG: 1
MACOSX_DEPLOYMENT_TARGET: 11.0
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1
DIST_REQUIRE_ALL_TOOLS: 1
JEMALLOC_SYS_WITH_LG_PAGE: 14
os: macos-latest
- name: x86_64-msvc-1
env:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2192,9 +2192,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"

[[package]]
name = "openssl-src"
version = "111.10.2+1.1.1g"
version = "111.12.0+1.1.1h"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70"
checksum = "858a4132194f8570a7ee9eb8629e85b23cbc4565f2d4a162e87556e5956abf61"
dependencies = [
"cc",
]
Expand Down
17 changes: 10 additions & 7 deletions src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,24 +469,27 @@ jobs:
--build=x86_64-apple-darwin
--host=aarch64-apple-darwin
--target=aarch64-apple-darwin
--enable-full-tools
--enable-sanitizers
--enable-profiler
--set rust.jemalloc
--set llvm.ninja=false
--tools=rls,clippy,rustfmt,analysis,src
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
SELECT_XCODE: /Applications/Xcode_12_beta.app
USE_XCODE_CLANG: 1
MACOSX_DEPLOYMENT_TARGET: 11.0
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1
# TODO: Cargo is disabled until OpenSSL 1.1.1 can be
# compiled for aarch64-apple-darwin::
# https://github.com/openssl/openssl/pull/12369. Once
# fixed, remove `--tools`, add back
# `--enable-full-tools`, and enable this again
# DIST_REQUIRE_ALL_TOOLS: 1
DIST_REQUIRE_ALL_TOOLS: 1
# Corresponds to 16K page size
#
# Shouldn't be needed if jemalloc-sys is updated to
# handle this platform like iOS or if we build on
# aarch64-apple-darwin itself.
#
# https://github.com/gnzlbg/jemallocator/blob/c27a859e98e3cb790dc269773d9da71a1e918458/jemalloc-sys/build.rs#L237
JEMALLOC_SYS_WITH_LG_PAGE: 14
<<: *job-macos-xl

######################
Expand Down
2 changes: 1 addition & 1 deletion src/doc/rustc/src/platform-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Specifically, these platforms are required to have each of the following:

target | std | host | notes
-------|-----|------|-------
`aarch64-apple-darwin` | ✓ | | ARM64 macOS (11.0+, Big Sur+)
`aarch64-apple-darwin` | ✓ | ✓ | ARM64 macOS (11.0+, Big Sur+)
`aarch64-apple-ios` | ✓ | | ARM64 iOS
`aarch64-fuchsia` | ✓ | | ARM64 Fuchsia
`aarch64-linux-android` | ✓ | | ARM64 Android
Expand Down