From b7ca1c5a1e349edebae2ca4a2525dc6ecf04f17d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Tue, 24 Sep 2019 11:55:53 -0700
Subject: [PATCH] fix rebase

---
 src/test/ui/issues/issue-54954.stderr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/ui/issues/issue-54954.stderr b/src/test/ui/issues/issue-54954.stderr
index 82315c125798..56ccdaf7aac4 100644
--- a/src/test/ui/issues/issue-54954.stderr
+++ b/src/test/ui/issues/issue-54954.stderr
@@ -11,7 +11,7 @@ LL | const ARR_LEN: usize = Tt::const_val::<[i8; 123]>();
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     const fn const_val<T: Sized>() -> usize {
-   |     --------------------------------------- required by `Tt::const_val`
+   |              --------- - required by this bound in `Tt::const_val`
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/issue-54954.rs:13:15