From c64f0698f0c5825e38a32dfc0ca7dcb38820e342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Campinas?= <stephane.campinas@gmail.com>
Date: Mon, 20 May 2019 23:30:15 +0200
Subject: [PATCH] changelog for 1.2.0

---
 CHANGELOG.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5cf3a818cbf..d42f38bcef0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,23 @@
 - `use_small_heuristics` changed to be an enum and stabilised. Configuration
   options are now ready for 1.0.
 
-## [1.1.1] 2019-03-21
+## [1.2.0] 2019-03-27
 
 ### Added
 
 - Add new attribute `rustfmt::skip::macros` to prevent rustfmt from formatting a macro #3454
 
+### Changed
+
+- Discard error report in silent_emitter #3466
+
+### Fixed
+
+- Fix bad performance on deeply nested binary expressions #3467
+- Use BTreeMap to guarantee consistent ordering b4d4b57
+
+## [1.1.1] 2019-03-21
+
 ### Fixed
 
 - Avoid panic on macro inside deeply nested block c9479de