Add edition + style_edition as options when running the Diff Check

Both of these options impact how code is parsed an formatted. To get
better control for formatting we now need to explicitly pass these
values when running the Diff Check CI job.

Author: ytmimi

.github/workflows/check_diff.yml

@@ -8,6 +8,24 @@ on:
       branch_name:
         description: 'Name of the feature branch on the forked repo'
         required: true
+      edition:
+        description: 'Which rust `edition` to use when parsing code'
+        required: true
+        type: choice
+        options:
+          - '2015'
+          - '2018'
+          - '2021'
+          - '2024'
+        default: '2015'
+      style_edition:
+        description: 'Which rustfmt `style_edition` to use when formatting'
+        required: true
+        type: choice
+        options:
+          - '2021' # 2015, 2018, and 2021 are all the same for `style_edition`
+          - '2024'
+        default: '2021'
       commit_hash:
         description: 'Optional commit hash from the feature branch'
         required: false
@@ -30,4 +48,4 @@ jobs:
         rustup target add x86_64-unknown-linux-gnu
 
     - name: check diff
-      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.branch_name }} ${{ github.event.inputs.rustfmt_configs }}
+      run: bash ${GITHUB_WORKSPACE}/ci/check_diff.sh ${{ github.event.inputs.clone_url }} ${{ github.event.inputs.branch_name }} ${{ github.event.inputs.edition }} ${{ github.event.inputs.style_edition }} ${{ github.event.inputs.commit_hash || github.event.inputs.branch_name }} ${{ github.event.inputs.rustfmt_configs }}

ci/check_diff.sh

@@ -3,7 +3,7 @@
 set -e
 
 function print_usage() {
-    echo "usage check_diff REMOTE_REPO FEATURE_BRANCH [COMMIT_HASH] [OPTIONAL_RUSTFMT_CONFIGS]"
+    echo "usage check_diff REMOTE_REPO FEATURE_BRANCH EDITION STYLE_EDITION [COMMIT_HASH] [OPTIONAL_RUSTFMT_CONFIGS]"
 }
 
 if [ $# -le 1 ]; then
@@ -13,8 +13,10 @@ fi
 
 REMOTE_REPO=$1
 FEATURE_BRANCH=$2
-OPTIONAL_COMMIT_HASH=$3
-OPTIONAL_RUSTFMT_CONFIGS=$4
+EDITION=${3:-2015}
+STYLE_EDITION=${4:-2021}
+OPTIONAL_COMMIT_HASH=$5
+OPTIONAL_RUSTFMT_CONFIGS=$6
 
 # OUTPUT array used to collect all the status of running diffs on various repos
 STATUSES=()
@@ -55,7 +57,7 @@ function create_diff() {
 
     for i in `find . | grep "\.rs$"`
     do
-        $1 --unstable-features --skip-children --check --color=always $config $i >> $2 2>/dev/null
+        $1 --edition=$EDITION --style-edition $STYLE_EDITION --unstable-features --skip-children --check --color=always $config $i >> $2 2>/dev/null
     done
 }
 
@@ -189,6 +191,7 @@ function main() {
     echo Created tmp_dir $tmp_dir
 
     compile_rustfmt $tmp_dir
+    echo Parsing code with rust edition $EDITION and formatting code with style_edition $STYLE_EDITION
 
     # run checks
     check_repo "https://github.com/rust-lang/rust.git" rust-lang-rust