From e1d0eeb9629400fbf649d15de73d619cd4690578 Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Fri, 30 Oct 2020 00:37:08 -0500
Subject: [PATCH] meta: bump rustfmt version to 1.4.23

---
 CHANGELOG.md | 19 ++++++++++++++++++-
 Cargo.lock   |  2 +-
 Cargo.toml   |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 903b6f121e6..1c07e15f4c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 ## [Unreleased]
 
+## [1.4.22] 2020-10-30
+
+### Changed
+
+- Update `rustc-ap-*` crates to v686.0.0
+
+### Added
+- Initial support for formatting new ConstBlock syntax ([#4478](https://github.com/rust-lang/rustfmt/pull/4478))
+
+### Fixed
+- Handling of unclosed delimiter-only parsing errors in input files ([#4466](https://github.com/rust-lang/rustfmt/issues/4466))
+- Misc. minor parser bugs ([#4418](https://github.com/rust-lang/rustfmt/issues/4418) and [#4431](https://github.com/rust-lang/rustfmt/issues/4431))
+- Panic on nested tuple access ([#4355](https://github.com/rust-lang/rustfmt/issues/4355))
+- Unable to disable license template path via cli override ([#4487](https://github.com/rust-lang/rustfmt/issues/4487))
+- Preserve comments in empty statements [#4018](https://github.com/rust-lang/rustfmt/issues/4018))
+- Indentation on skipped code [#4398](https://github.com/rust-lang/rustfmt/issues/4398))
+
+
 ## [1.4.22] 2020-10-04
 
 ### Changed
@@ -10,7 +28,6 @@
 - Add config option to allow control of leading match arm pipes
 - Support `RUSTFMT` environment variable in `cargo fmt` to run specified `rustfmt` instance
 
-
 ### Fixed
 
 - Fix preservation of type aliases within extern blocks
diff --git a/Cargo.lock b/Cargo.lock
index df5d17c6b32..7f3536cbe3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1237,7 +1237,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.22"
+version = "1.4.23"
 dependencies = [
  "annotate-snippets 0.6.1",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 855f321a918..c22e1b3d12c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustfmt-nightly"
-version = "1.4.22"
+version = "1.4.23"
 authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
 description = "Tool to find and fix Rust formatting issues"
 repository = "https://github.com/rust-lang/rustfmt"