From fa20338c9aa4a64d984c61ae5f4332db89c78de1 Mon Sep 17 00:00:00 2001
From: Christian Poveda <christianpoveda@protonmail.com>
Date: Thu, 12 Sep 2019 09:25:39 -0500
Subject: [PATCH] Use str::from_utf8 instead

---
 src/shims/mod.rs                     | 1 -
 tests/run-pass/aligned_utf8_check.rs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/shims/mod.rs b/src/shims/mod.rs
index 5b67d075a5c..728634a7f6f 100644
--- a/src/shims/mod.rs
+++ b/src/shims/mod.rs
@@ -1,4 +1,3 @@
-
 pub mod foreign_items;
 pub mod intrinsics;
 pub mod tls;
diff --git a/tests/run-pass/aligned_utf8_check.rs b/tests/run-pass/aligned_utf8_check.rs
index 0d2b2bf66a9..202856b3bde 100644
--- a/tests/run-pass/aligned_utf8_check.rs
+++ b/tests/run-pass/aligned_utf8_check.rs
@@ -6,7 +6,7 @@ fn main() {
     let mut y: Vec<u8> = unsafe { std::mem::transmute(x) };
     unsafe { y.set_len(2 * N) };
 
-    println!("{:?}", String::from_utf8_lossy(&y));
+    println!("{:?}", std::str::from_utf8(&y).unwrap());
 
     let mut x: Vec<u16> = unsafe { std::mem::transmute(y) };
     unsafe { x.set_len(N) };
-- 
2.44.0