Skip to content

Commit 0e19107

Browse files
Amjad50Amjad50
committed
Merge branch 'master' into emerald_os
2 parents ddda372 + 9db7a74 commit 0e19107

File tree

20,664 files changed

+289847
-158474
lines changed

Some content is hidden

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

20,664 files changed

+289847
-158474
lines changed

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ f97fddab91fbf290ea5b691fe355d6f915220b6e
2020
cc907f80b95c6ec530c5ee1b05b044a468f07eca
2121
# format let-chains
2222
b2d2184edea578109a48ec3d8decbee5948e8f35
23+
# test directives migration
24+
6e48b96692d63a79a14563f27fe5185f122434f8
25+
ec2cc761bc7067712ecc7734502f703fe3b024c8

‎.github/workflows/ci.yml

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,27 @@ jobs:
5858
- name: mingw-check-tidy
5959
os: ubuntu-20.04-4core-16gb
6060
env: {}
61-
- name: x86_64-gnu-llvm-16
61+
- name: x86_64-gnu-llvm-17
6262
env:
6363
ENABLE_GCC_CODEGEN: "1"
6464
os: ubuntu-20.04-16core-64gb
6565
- name: x86_64-gnu-tools
6666
os: ubuntu-20.04-16core-64gb
6767
env: {}
68+
defaults:
69+
run:
70+
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
6871
timeout-minutes: 600
6972
runs-on: "${{ matrix.os }}"
7073
steps:
74+
- if: "contains(matrix.os, 'windows')"
75+
uses: msys2/[email protected]
76+
with:
77+
msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
78+
update: false
79+
release: true
80+
path-type: inherit
81+
install: "make dos2unix diffutils\n"
7182
- name: disable git crlf conversion
7283
run: git config --global core.autocrlf false
7384
- name: checkout the source code
@@ -145,7 +156,7 @@ jobs:
145156
run: src/ci/scripts/verify-stable-version-number.sh
146157
if: success() && !env.SKIP_JOB
147158
- name: run the build
148-
run: src/ci/scripts/run-build-from-ci.sh
159+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
149160
env:
150161
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
151162
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -155,7 +166,7 @@ jobs:
155166
run: src/ci/scripts/create-doc-artifacts.sh
156167
if: success() && !env.SKIP_JOB
157168
- name: upload artifacts to github
158-
uses: actions/upload-artifact@v3
169+
uses: actions/upload-artifact@v4
159170
with:
160171
name: "${{ env.DOC_ARTIFACT_NAME }}"
161172
path: obj/artifacts/doc
@@ -224,6 +235,9 @@ jobs:
224235
- name: dist-loongarch64-linux
225236
os: ubuntu-20.04-8core-32gb
226237
env: {}
238+
- name: dist-ohos
239+
os: ubuntu-20.04-8core-32gb
240+
env: {}
227241
- name: dist-powerpc-linux
228242
os: ubuntu-20.04-8core-32gb
229243
env: {}
@@ -301,11 +315,11 @@ jobs:
301315
- name: x86_64-gnu-distcheck
302316
os: ubuntu-20.04-8core-32gb
303317
env: {}
304-
- name: x86_64-gnu-llvm-17
318+
- name: x86_64-gnu-llvm-18
305319
env:
306320
RUST_BACKTRACE: 1
307321
os: ubuntu-20.04-8core-32gb
308-
- name: x86_64-gnu-llvm-16
322+
- name: x86_64-gnu-llvm-17
309323
env:
310324
RUST_BACKTRACE: 1
311325
os: ubuntu-20.04-8core-32gb
@@ -319,10 +333,10 @@ jobs:
319333
- name: dist-x86_64-apple
320334
env:
321335
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
322-
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
336+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1"
323337
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
324338
MACOSX_DEPLOYMENT_TARGET: 10.12
325-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
339+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
326340
NO_LLVM_ASSERTIONS: 1
327341
NO_DEBUG_ASSERTIONS: 1
328342
NO_OVERFLOW_CHECKS: 1
@@ -335,7 +349,7 @@ jobs:
335349
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
336350
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
337351
MACOSX_DEPLOYMENT_TARGET: 10.12
338-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
352+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
339353
NO_LLVM_ASSERTIONS: 1
340354
NO_DEBUG_ASSERTIONS: 1
341355
NO_OVERFLOW_CHECKS: 1
@@ -347,6 +361,7 @@ jobs:
347361
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
348362
MACOSX_DEPLOYMENT_TARGET: 10.12
349363
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
364+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
350365
NO_LLVM_ASSERTIONS: 1
351366
NO_DEBUG_ASSERTIONS: 1
352367
NO_OVERFLOW_CHECKS: 1
@@ -358,6 +373,7 @@ jobs:
358373
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
359374
MACOSX_DEPLOYMENT_TARGET: 10.12
360375
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
376+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
361377
NO_LLVM_ASSERTIONS: 1
362378
NO_DEBUG_ASSERTIONS: 1
363379
NO_OVERFLOW_CHECKS: 1
@@ -367,7 +383,7 @@ jobs:
367383
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
368384
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
369385
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
370-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
386+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
371387
USE_XCODE_CLANG: 1
372388
MACOSX_DEPLOYMENT_TARGET: 11.0
373389
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -381,7 +397,7 @@ jobs:
381397
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
382398
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
383399
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
384-
SELECT_XCODE: /Applications/Xcode_13.4.1.app
400+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
385401
USE_XCODE_CLANG: 1
386402
MACOSX_DEPLOYMENT_TARGET: 11.0
387403
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -422,7 +438,7 @@ jobs:
422438
os: windows-2019-8core-32gb
423439
- name: dist-x86_64-msvc
424440
env:
425-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
441+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler --set rust.codegen-units=1"
426442
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
427443
DIST_REQUIRE_ALL_TOOLS: 1
428444
os: windows-2019-8core-32gb
@@ -459,9 +475,20 @@ jobs:
459475
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
460476
SCRIPT: python x.py dist bootstrap --include-default-paths
461477
os: windows-2019-8core-32gb
478+
defaults:
479+
run:
480+
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
462481
timeout-minutes: 600
463482
runs-on: "${{ matrix.os }}"
464483
steps:
484+
- if: "contains(matrix.os, 'windows')"
485+
uses: msys2/[email protected]
486+
with:
487+
msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
488+
update: false
489+
release: true
490+
path-type: inherit
491+
install: "make dos2unix diffutils\n"
465492
- name: disable git crlf conversion
466493
run: git config --global core.autocrlf false
467494
- name: checkout the source code
@@ -539,7 +566,7 @@ jobs:
539566
run: src/ci/scripts/verify-stable-version-number.sh
540567
if: success() && !env.SKIP_JOB
541568
- name: run the build
542-
run: src/ci/scripts/run-build-from-ci.sh
569+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
543570
env:
544571
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
545572
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -549,7 +576,7 @@ jobs:
549576
run: src/ci/scripts/create-doc-artifacts.sh
550577
if: success() && !env.SKIP_JOB
551578
- name: upload artifacts to github
552-
uses: actions/upload-artifact@v3
579+
uses: actions/upload-artifact@v4
553580
with:
554581
name: "${{ env.DOC_ARTIFACT_NAME }}"
555582
path: obj/artifacts/doc
@@ -587,9 +614,20 @@ jobs:
587614
env:
588615
CODEGEN_BACKENDS: "llvm,cranelift"
589616
os: ubuntu-20.04-16core-64gb
617+
defaults:
618+
run:
619+
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
590620
timeout-minutes: 600
591621
runs-on: "${{ matrix.os }}"
592622
steps:
623+
- if: "contains(matrix.os, 'windows')"
624+
uses: msys2/[email protected]
625+
with:
626+
msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}"
627+
update: false
628+
release: true
629+
path-type: inherit
630+
install: "make dos2unix diffutils\n"
593631
- name: disable git crlf conversion
594632
run: git config --global core.autocrlf false
595633
- name: checkout the source code
@@ -667,7 +705,7 @@ jobs:
667705
run: src/ci/scripts/verify-stable-version-number.sh
668706
if: success() && !env.SKIP_JOB
669707
- name: run the build
670-
run: src/ci/scripts/run-build-from-ci.sh
708+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
671709
env:
672710
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
673711
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -677,7 +715,7 @@ jobs:
677715
run: src/ci/scripts/create-doc-artifacts.sh
678716
if: success() && !env.SKIP_JOB
679717
- name: upload artifacts to github
680-
uses: actions/upload-artifact@v3
718+
uses: actions/upload-artifact@v4
681719
with:
682720
name: "${{ env.DOC_ARTIFACT_NAME }}"
683721
path: obj/artifacts/doc

‎.github/workflows/dependencies.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ jobs:
6565
# Remove first line that always just says "Updating crates.io index"
6666
run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
6767
- name: upload Cargo.lock artifact for use in PR
68-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@v4
6969
with:
7070
name: Cargo-lock
7171
path: Cargo.lock
7272
retention-days: 1
7373
- name: upload cargo-update log artifact for use in PR
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: cargo-updates
7777
path: cargo_update.log
@@ -90,11 +90,11 @@ jobs:
9090
uses: actions/checkout@v4
9191

9292
- name: download Cargo.lock from update job
93-
uses: actions/download-artifact@v3
93+
uses: actions/download-artifact@v4
9494
with:
9595
name: Cargo-lock
9696
- name: download cargo-update log from update job
97-
uses: actions/download-artifact@v3
97+
uses: actions/download-artifact@v4
9898
with:
9999
name: cargo-updates
100100

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/17.0-2023-12-14
36+
branch = rustc/18.0-2024-02-13
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

‎.mailmap

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ James Hinshelwood <[email protected]> <[email protected]>
259259
James Miller <[email protected]> <[email protected]>
260260
James Perry <[email protected]>
261261
James Sanderson <[email protected]>
262+
Jan-Erik Rediger <[email protected]> <[email protected]>
262263
Jaro Fietz <[email protected]>
263264
Jason Fager <[email protected]>
264265
Jason Liquorish <[email protected]> <[email protected]>
@@ -306,6 +307,8 @@ Joseph T. Lyons <[email protected]> <[email protected]>
306307
Josh Cotton <[email protected]>
307308
Josh Driver <[email protected]>
308309
Josh Holmer <[email protected]>
310+
Josh Stone <[email protected]> <[email protected]>
311+
Josh Stone <[email protected]> <[email protected]>
309312
Julian Knodt <[email protected]>
310313
jumbatm <[email protected]> <[email protected]>
311314
Junyoung Cho <[email protected]>
@@ -323,6 +326,7 @@ Katze <[email protected]>
323326
Keegan McAllister <[email protected]> <[email protected]>
324327
Kerem Kat <[email protected]>
325328
Kevin Butler <[email protected]>
329+
Kevin Reid <[email protected]> <[email protected]>
326330
Kevin Jiang <[email protected]>
327331
Kornel Lesiński <[email protected]>
328332
Krishna Sai Veera Reddy <[email protected]>
@@ -472,7 +476,8 @@ Philipp Matthias Schäfer <[email protected]>
472476
phosphorus <[email protected]>
473477
Pierre Krieger <[email protected]>
474478
pierwill <[email protected]> <[email protected]>
475-
Pietro Albini <[email protected]> <[email protected]> <[email protected]>
479+
Pietro Albini <[email protected]> <[email protected]>
480+
Pietro Albini <[email protected]> <[email protected]>
476481
Pradyumna Rahul <[email protected]>
477482
Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
478483
r00ster <[email protected]>
@@ -541,6 +546,7 @@ Takashi Idobe <[email protected]>
541546
Takayuki Maeda <[email protected]>
542547
Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
543548
Tatsuyuki Ishi <[email protected]>
549+
Tau Gärtli <[email protected]> <[email protected]>
544550
Tero Hänninen <[email protected]> Tero Hänninen <[email protected]>
545551
The8472 <[email protected]>
546552
Theo Belaire <[email protected]> Theo Belaire <[email protected]>

‎.reuse/dep5

Lines changed: 1 addition & 1 deletion
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/sync/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)