Skip to content

Commit 67e7d4a

Browse files
agg23agg23
committed
Merge branch 'master' of https://github.com/rust-lang/rust into xrOS-pr
2 parents 22fb94f + f8131a4 commit 67e7d4a

File tree

15,170 files changed

+171045
-91884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

15,170 files changed

+171045
-91884
lines changed

Diff for: ‎.github/workflows/ci.yml

+30-12
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ name: CI
2828
- "**"
2929
permissions:
3030
contents: read
31+
packages: write
3132
defaults:
3233
run:
3334
shell: bash
@@ -42,6 +43,7 @@ jobs:
4243
CI_JOB_NAME: "${{ matrix.name }}"
4344
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
4445
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
46+
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
4547
SCCACHE_BUCKET: rust-lang-ci-sccache2
4648
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4749
CACHE_DOMAIN: ci-caches.rust-lang.org
@@ -172,6 +174,7 @@ jobs:
172174
CI_JOB_NAME: "${{ matrix.name }}"
173175
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
174176
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
177+
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
175178
SCCACHE_BUCKET: rust-lang-ci-sccache2
176179
DEPLOY_BUCKET: rust-lang-ci2
177180
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -291,7 +294,7 @@ jobs:
291294
- name: x86_64-gnu-integration
292295
env:
293296
CI_ONLY_WHEN_CHANNEL: nightly
294-
os: ubuntu-20.04-16core-64gb
297+
os: ubuntu-20.04-8core-32gb
295298
- name: x86_64-gnu-debug
296299
os: ubuntu-20.04-8core-32gb
297300
env: {}
@@ -316,10 +319,10 @@ jobs:
316319
- name: dist-x86_64-apple
317320
env:
318321
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
319-
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
322+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
320323
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
321324
MACOSX_DEPLOYMENT_TARGET: 10.12
322-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
325+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
323326
NO_LLVM_ASSERTIONS: 1
324327
NO_DEBUG_ASSERTIONS: 1
325328
NO_OVERFLOW_CHECKS: 1
@@ -329,51 +332,65 @@ jobs:
329332
- name: dist-apple-various
330333
env:
331334
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
332-
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
335+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
333336
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
334337
MACOSX_DEPLOYMENT_TARGET: 10.12
335-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
338+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
336339
NO_LLVM_ASSERTIONS: 1
337340
NO_DEBUG_ASSERTIONS: 1
338341
NO_OVERFLOW_CHECKS: 1
339342
os: macos-13
340343
- name: x86_64-apple-1
341344
env:
342345
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
343-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
346+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
344347
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
345348
MACOSX_DEPLOYMENT_TARGET: 10.12
346349
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
350+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
347351
NO_LLVM_ASSERTIONS: 1
348352
NO_DEBUG_ASSERTIONS: 1
349353
NO_OVERFLOW_CHECKS: 1
350354
os: macos-13
351355
- name: x86_64-apple-2
352356
env:
353357
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
354-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
358+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
355359
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
356360
MACOSX_DEPLOYMENT_TARGET: 10.12
357361
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
362+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
358363
NO_LLVM_ASSERTIONS: 1
359364
NO_DEBUG_ASSERTIONS: 1
360365
NO_OVERFLOW_CHECKS: 1
361366
os: macos-13
362367
- name: dist-aarch64-apple
363368
env:
364-
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
365-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --disable-docs --set rust.jemalloc --set llvm.ninja=false"
369+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
370+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
366371
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
367-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
372+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
368373
USE_XCODE_CLANG: 1
369374
MACOSX_DEPLOYMENT_TARGET: 11.0
370375
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
371376
NO_LLVM_ASSERTIONS: 1
372377
NO_DEBUG_ASSERTIONS: 1
373378
NO_OVERFLOW_CHECKS: 1
374379
DIST_REQUIRE_ALL_TOOLS: 1
375-
JEMALLOC_SYS_WITH_LG_PAGE: 14
376-
os: macos-13
380+
os: macos-14
381+
- name: aarch64-apple
382+
env:
383+
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
384+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
385+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
386+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
387+
USE_XCODE_CLANG: 1
388+
MACOSX_DEPLOYMENT_TARGET: 11.0
389+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
390+
NO_LLVM_ASSERTIONS: 1
391+
NO_DEBUG_ASSERTIONS: 1
392+
NO_OVERFLOW_CHECKS: 1
393+
os: macos-14
377394
- name: x86_64-msvc
378395
env:
379396
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -554,6 +571,7 @@ jobs:
554571
CI_JOB_NAME: "${{ matrix.name }}"
555572
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
556573
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
574+
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
557575
SCCACHE_BUCKET: rust-lang-ci-sccache2
558576
DEPLOY_BUCKET: rust-lang-ci2
559577
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"

Diff for: ‎.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
shallow = true
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
35-
url = https://github.com/agg23/llvm-project.git
36-
branch = xrOS-Apple
35+
url = https://github.com/rust-lang/llvm-project.git
36+
branch = rustc/18.0-2024-02-13
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

Diff for: ‎.mailmap

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Clement Miao <[email protected]>
129129
Clément Renault <[email protected]>
130130
Cliff Dyer <[email protected]>
131131
Clinton Ryan <[email protected]>
132-
Corey Richardson <[email protected]> Elaine "See More" Nemo <[email protected]>
132+
ember arlynx <[email protected]> <[email protected]>
133133
Crazycolorz5 <[email protected]>
134134
csmoe <[email protected]>
135135
Cyryl Płotnicki <[email protected]>

Diff for: ‎.reuse/dep5

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Copyright: 2019 The Crossbeam Project Developers
5252
The Rust Project Developers (see https://thanks.rust-lang.org)
5353
License: MIT OR Apache-2.0
5454

55-
Files: library/std/src/sys/pal/unix/locks/fuchsia_mutex.rs
55+
Files: library/std/src/sys/locks/mutex/fuchsia.rs
5656
Copyright: 2016 The Fuchsia Authors
5757
The Rust Project Developers (see https://thanks.rust-lang.org)
5858
License: BSD-2-Clause AND (MIT OR Apache-2.0)

0 commit comments

Comments
 (0)