Skip to content

Commit f3db477

Browse files
committed
Merge branch 'master' of https://github.com/rust-lang/rust into arc-spin-loop-hint
2 parents a838a70 + bd51226 commit f3db477

File tree

2,174 files changed

+23504
-10959
lines changed

Some content is hidden

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

2,174 files changed

+23504
-10959
lines changed

.github/ISSUE_TEMPLATE/tracking_issue.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The feature gate for the issue is `#![feature(FFF)]`.
2323
### About tracking issues
2424

2525
Tracking issues are used to record the overall progress of implementation.
26-
They are also uses as hubs connecting to other relevant issues, e.g., bugs or open design questions.
26+
They are also used as hubs connecting to other relevant issues, e.g., bugs or open design questions.
2727
A tracking issue is however *not* meant for large scale discussion, questions, or bug reports about a feature.
2828
Instead, open a dedicated issue for the specific matter and add the relevant feature gate label.
2929

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -431,15 +431,15 @@ jobs:
431431
- name: x86_64-mingw-1
432432
env:
433433
SCRIPT: make ci-mingw-subset-1
434-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu"
434+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
435435
CUSTOM_MINGW: 1
436436
NO_DEBUG_ASSERTIONS: 1
437437
NO_LLVM_ASSERTIONS: 1
438438
os: windows-latest-xl
439439
- name: x86_64-mingw-2
440440
env:
441441
SCRIPT: make ci-mingw-subset-2
442-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu"
442+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
443443
CUSTOM_MINGW: 1
444444
os: windows-latest-xl
445445
- name: dist-x86_64-msvc

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ __pycache__/
3333
/mingw-build/
3434
# Created by default with `src/ci/docker/run.sh`:
3535
/obj/
36-
/rustllvm/
3736
/unicode-downloads
3837
/target
3938
# Generated by compiletest for incremental:

0 commit comments

Comments
 (0)