Merge remote-tracking branch 'wilfred/master' into skip-dirs-in-gitig…

…nore

# Conflicts:
#	Cargo.lock

.github/workflows/deploy_docs.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install jq
         run: sudo apt-get install -y jq
 
-      - uses: dtolnay/rust-toolchain@1.59.0
+      - uses: dtolnay/rust-toolchain@1.60.0
       - run: cargo doc
 
       - name: Setup mdBook

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@1.59.0
+      uses: dtolnay/rust-toolchain@1.60.0
       with:
         targets: ${{ matrix.job.target }}
 
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.59.0
+      - uses: dtolnay/rust-toolchain@1.60.0
       # This runs tests that rely on the MIME database being present.
       - run: cargo test -- --ignored
 
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.59.0
+      - uses: dtolnay/rust-toolchain@1.60.0
       - name: Generate output for all sample files
         run: ./sample_files/compare_all.sh
       - name: Verify output is unchanged
@@ -76,13 +76,13 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.59.0
+      - uses: dtolnay/rust-toolchain@1.60.0
       - run: cargo package --allow-dirty
 
   fmt:
     name: Rustfmt
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.59.0
+      - uses: dtolnay/rust-toolchain@1.60.0
       - run: cargo fmt --all -- --check

CHANGELOG.md

@@ -1,11 +1,32 @@
 ## 0.53 (unreleased)
 
+### Parsing
+
+Added support for SCSS.
+
+Updated the Kotlin parser and improved handling of Kotlin nullable
+types.
+
+`.snap` files (Jest snapshots) are now detected as JavaScript files.
+
+### Diffing
+
+Fixed an issue where adding or removing blank lines would be ignored
+by the textual diffing logic.
+
 ### Command Line Interface
 
 Added the option `--strip-cr`. This removes all carriage return
 characters before diffing, which is helpful when dealing with a mix of
 Windows and non-Windows flies.
 
+The option `--skip-unchanged` now has a corresponding environment
+option `DFT_SKIP_UNCHANGED`.
+
+### Build
+
+Difftastic now requires Rust 1.60 to build.
+
 ## 0.52 (released 8th October 2023)
 
 ### Parsing