Skip to content

Commit 2c8b20b

Browse files
committed
Merge branch 'overflow.hex.fix' of https://github.com/11happy/rust into overflow.hex.fix
2 parents 17d15c4 + 6ad0c41 commit 2c8b20b

File tree

4,122 files changed

+64435
-39907
lines changed

Some content is hidden

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

4,122 files changed

+64435
-39907
lines changed

Diff for: .editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ end_of_line = lf
99
charset = utf-8
1010
trim_trailing_whitespace = true
1111
insert_final_newline = true
12+
13+
[!src/llvm-project]
1214
indent_style = space
1315
indent_size = 4
1416

Diff for: .git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ ec2cc761bc7067712ecc7734502f703fe3b024c8
2929
99cb0c6bc399fb94a0ddde7e9b38e9c00d523bad
3030
# reformat with rustfmt edition 2024
3131
c682aa162b0d41e21cc6748f4fecfe01efb69d1f
32+
# reformat with updated edition 2024
33+
1fcae03369abb4c2cc180cd5a49e1f4440a81300

Diff for: .github/workflows/ci.yml

-19
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ jobs:
6262
name: ${{ matrix.full_name }}
6363
needs: [ calculate_matrix ]
6464
runs-on: "${{ matrix.os }}"
65-
defaults:
66-
run:
67-
shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
6865
timeout-minutes: 360
6966
env:
7067
CI_JOB_NAME: ${{ matrix.name }}
@@ -80,22 +77,6 @@ jobs:
8077
# Check the `calculate_matrix` job to see how is the matrix defined.
8178
include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
8279
steps:
83-
- if: contains(matrix.os, 'windows')
84-
uses: msys2/[email protected]
85-
with:
86-
# i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
87-
msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
88-
# don't try to download updates for already installed packages
89-
update: false
90-
# don't try to use the msys that comes built-in to the github runner,
91-
# so we can control what is installed (i.e. not python)
92-
release: true
93-
# Inherit the full path from the Windows environment, with MSYS2's */bin/
94-
# dirs placed in front. This lets us run Windows-native Python etc.
95-
path-type: inherit
96-
install: >
97-
make
98-
9980
- name: disable git crlf conversion
10081
run: git config --global core.autocrlf false
10182

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ no_llvm_build
5454
/library/target
5555
/src/bootstrap/target
5656
/src/tools/x/target
57+
# Created by `x vendor`
58+
/vendor
5759
# Created by default with `src/ci/docker/run.sh`
5860
/obj/
5961
# Created by nix dev shell / .envrc

0 commit comments

Comments
 (0)