Skip to content

Commit c048326

Browse files
committedJan 25, 2023
Auto merge of #107275 - calebcartwright:sync-from-rustfmt, r=calebcartwright
Sync rustfmt subtree
2 parents c8e6a9e + 6bf1a87 commit c048326

File tree

109 files changed

+2593
-189
lines changed

Some content is hidden

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

109 files changed

+2593
-189
lines changed
 

‎Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -4926,7 +4926,7 @@ dependencies = [
49264926

49274927
[[package]]
49284928
name = "rustfmt-config_proc_macro"
4929-
version = "0.2.0"
4929+
version = "0.3.0"
49304930
dependencies = [
49314931
"proc-macro2",
49324932
"quote",
@@ -4936,7 +4936,7 @@ dependencies = [
49364936

49374937
[[package]]
49384938
name = "rustfmt-nightly"
4939-
version = "1.5.1"
4939+
version = "1.5.2"
49404940
dependencies = [
49414941
"annotate-snippets",
49424942
"anyhow",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Diff Check
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
clone_url:
6+
description: 'Git url of a rustfmt fork to compare against the latest master rustfmt'
7+
required: true
8+
branch_name:
9+
description: 'Name of the feature branch on the forked repo'
10+
required: true
11+
commit_hash:
12+
description: 'Optional commit hash from the feature branch'
13+
required: false
14+
rustfmt_configs:
15+
description: 'Optional comma separated list of rustfmt config options to pass when running the feature branch'
16+
required: false
17+
18+
jobs:
19+
diff_check:
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- name: checkout
24+
uses: actions/checkout@v3
25+
26+
- name: install rustup
27+
run: |
28+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh
29+
sh rustup-init.sh -y --default-toolchain none
30+
rustup target add x86_64-unknown-linux-gnu
31+
32+
- name: check diff
33+
run: bash ${GITHUB_WORKSPACE}/ci/check_diff.sh ${{ github.event.inputs.clone_url }} ${{ github.event.inputs.branch_name }} ${{ github.event.inputs.commit_hash }} ${{ github.event.inputs.rustfmt_configs }}

0 commit comments

Comments
 (0)