From a61b9638bbbb48f9c2fde0ccbbcf03e64494ea0f Mon Sep 17 00:00:00 2001 From: Alexis Bourget Date: Fri, 25 Sep 2020 23:10:24 +0200 Subject: review: fix nits and move panic safety tests to the correct place --- library/alloc/tests/boxed.rs | 3 +-- library/alloc/tests/fmt.rs | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'library/alloc') diff --git a/library/alloc/tests/boxed.rs b/library/alloc/tests/boxed.rs index df13b36e778..6a83f5da87c 100644 --- a/library/alloc/tests/boxed.rs +++ b/library/alloc/tests/boxed.rs @@ -1,3 +1,4 @@ +use std::cell::Cell; use std::mem::MaybeUninit; use std::ptr::NonNull; @@ -52,8 +53,6 @@ fn box_clone_from_ptr_stability() { #[test] fn box_deref_lval() { - use std::cell::Cell; - let x = Box::new(Cell::new(5)); x.set(1000); assert_eq!(x.get(), 1000); diff --git a/library/alloc/tests/fmt.rs b/library/alloc/tests/fmt.rs index 6fd6468c3ce..757fddd2418 100644 --- a/library/alloc/tests/fmt.rs +++ b/library/alloc/tests/fmt.rs @@ -1,5 +1,4 @@ #![deny(warnings)] -#![allow(unused_must_use)] use std::cell::RefCell; use std::fmt::{self, Write}; @@ -241,15 +240,15 @@ fn test_format_macro_interface() { #[test] fn test_write() { let mut buf = String::new(); - write!(&mut buf, "{}", 3); + let _ = write!(&mut buf, "{}", 3); { let w = &mut buf; - write!(w, "{foo}", foo = 4); - write!(w, "{}", "hello"); - writeln!(w, "{}", "line"); - writeln!(w, "{foo}", foo = "bar"); - w.write_char('☃'); - w.write_str("str"); + let _ = write!(w, "{foo}", foo = 4); + let _ = write!(w, "{}", "hello"); + let _ = writeln!(w, "{}", "line"); + let _ = writeln!(w, "{foo}", foo = "bar"); + let _ = w.write_char('☃'); + let _ = w.write_str("str"); } t!(buf, "34helloline\nbar\n☃str"); @@ -273,9 +272,9 @@ fn test_format_args() { let mut buf = String::new(); { let w = &mut buf; - write!(w, "{}", format_args!("{}", 1)); - write!(w, "{}", format_args!("test")); - write!(w, "{}", format_args!("{test}", test = 3)); + let _ = write!(w, "{}", format_args!("{}", 1)); + let _ = write!(w, "{}", format_args!("test")); + let _ = write!(w, "{}", format_args!("{test}", test = 3)); } let s = buf; t!(s, "1test3"); -- cgit 1.4.1-3-g733a5