about summary refs log tree commit diff
path: root/src/librustc
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-01-17 11:16:39 +0530
committerGitHub <noreply@github.com>2020-01-17 11:16:39 +0530
commitc411c22eb00580f4bea32eabc7f4458d4ee4a598 (patch)
treeb4fcff5f71595ae513c30c5adc3d5eb50eb11323 /src/librustc
parentde01a29fbee586a13f10ee928df7c15c5a170587 (diff)
parentc781d15da32bf82977311af6f056ee2fc3506bda (diff)
downloadrust-c411c22eb00580f4bea32eabc7f4458d4ee4a598.tar.gz
rust-c411c22eb00580f4bea32eabc7f4458d4ee4a598.zip
Rollup merge of #68288 - RalfJung:fmt, r=oli-obk
Fix some of the rustfmt fallout in Miri

re-post of https://github.com/rust-lang/rust/pull/67833 without the `rustfmt::skip`

r? @oli-obk
Diffstat (limited to 'src/librustc')
-rw-r--r--src/librustc/mir/interpret/error.rs2
-rw-r--r--src/librustc/mir/interpret/mod.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs
index 8643bd63d8c..42d896af801 100644
--- a/src/librustc/mir/interpret/error.rs
+++ b/src/librustc/mir/interpret/error.rs
@@ -33,7 +33,7 @@ impl ErrorHandled {
             ErrorHandled::Reported => {}
             ErrorHandled::TooGeneric => bug!(
                 "MIR interpretation failed without reporting an error \
-                                              even though it was fully monomorphized"
+                 even though it was fully monomorphized"
             ),
         }
     }
diff --git a/src/librustc/mir/interpret/mod.rs b/src/librustc/mir/interpret/mod.rs
index 47f067590b9..e554b280ef7 100644
--- a/src/librustc/mir/interpret/mod.rs
+++ b/src/librustc/mir/interpret/mod.rs
@@ -403,8 +403,8 @@ impl<'tcx> AllocMap<'tcx> {
         let next = self.next_id;
         self.next_id.0 = self.next_id.0.checked_add(1).expect(
             "You overflowed a u64 by incrementing by 1... \
-                     You've just earned yourself a free drink if we ever meet. \
-                     Seriously, how did you do that?!",
+             You've just earned yourself a free drink if we ever meet. \
+             Seriously, how did you do that?!",
         );
         next
     }