Remove all no longer necessary uses of fmt::Write.

m-ou-se · m-ou-se · commit 27c50a0e884d · 2020-11-07T01:14:31.000+01:00
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -2003,7 +2003,6 @@ impl fmt::Display for InlineAsmTemplatePiece {
 impl InlineAsmTemplatePiece {
     /// Rebuilds the asm template string from its pieces.
     pub fn to_string(s: &[Self]) -> String {
-        use fmt::Write;
         let mut out = String::new();
         for p in s.iter() {
             let _ = write!(out, "{}", p);
diff --git a/compiler/rustc_ast_lowering/src/expr.rs b/compiler/rustc_ast_lowering/src/expr.rs
@@ -14,7 +14,6 @@ use rustc_span::source_map::{respan, DesugaringKind, Span, Spanned};
 use rustc_span::symbol::{sym, Ident, Symbol};
 use rustc_target::asm;
 use std::collections::hash_map::Entry;
-use std::fmt::Write;
 
 impl<'hir> LoweringContext<'_, 'hir> {
     fn lower_exprs(&mut self, exprs: &[AstP<Expr>]) -> &'hir [hir::Expr<'hir>] {
diff --git a/compiler/rustc_builtin_macros/src/format_foreign.rs b/compiler/rustc_builtin_macros/src/format_foreign.rs
@@ -71,8 +71,6 @@ pub mod printf {
         /// Returns `None` in cases where the `printf` directive does not have an exact Rust
         /// equivalent, rather than guessing.
         pub fn translate(&self) -> Option<String> {
-            use std::fmt::Write;
-
             let (c_alt, c_zero, c_left, c_plus) = {
                 let mut c_alt = false;
                 let mut c_zero = false;
@@ -245,7 +243,6 @@ pub mod printf {
         }
 
         fn translate(&self, s: &mut String) -> std::fmt::Result {
-            use std::fmt::Write;
             match *self {
                 Num::Num(n) => write!(s, "{}", n),
                 Num::Arg(n) => {
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
@@ -45,7 +45,7 @@ use tracing::debug;
 
 use libc::{c_longlong, c_uint};
 use std::collections::hash_map::Entry;
-use std::fmt::{self, Write};
+use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::iter;
 use std::path::{Path, PathBuf};
diff --git a/compiler/rustc_codegen_llvm/src/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs
@@ -11,8 +11,6 @@ use rustc_target::abi::{Int, Pointer, F32, F64};
 use rustc_target::abi::{LayoutOf, PointeeInfo, Scalar, Size, TyAndLayoutMethods, Variants};
 use tracing::debug;
 
-use std::fmt::Write;
-
 fn uncached_llvm_type<'a, 'tcx>(
     cx: &CodegenCx<'a, 'tcx>,
     layout: TyAndLayout<'tcx>,
diff --git a/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
@@ -5,8 +5,6 @@ use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::{self, subst::SubstsRef, Ty, TyCtxt};
 
-use std::fmt::Write;
-
 // Compute the name of the type as it should be stored in debuginfo. Does not do
 // any caching, i.e., calling the function twice with the same type will also do
 // the work twice. The `qualified` parameter only affects the first level of the
diff --git a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
@@ -11,7 +11,7 @@ use rustc_middle::ty::print::{FmtPrinter, Print, RegionHighlightMode};
 use rustc_middle::ty::subst::SubstsRef;
 use rustc_middle::ty::{self, TyCtxt};
 
-use std::fmt::{self, Write};
+use std::fmt;
 
 impl NiceRegionError<'me, 'tcx> {
     /// When given a `ConcreteFailure` for a function with arguments containing a named region and
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
@@ -54,7 +54,6 @@ use rustc_trait_selection::traits::misc::can_type_implement_copy;
 
 use crate::nonstandard_style::{method_context, MethodLateContext};
 
-use std::fmt::Write;
 use tracing::{debug, trace};
 
 // hardwired lints from librustc_middle
diff --git a/compiler/rustc_middle/src/mir/mono.rs b/compiler/rustc_middle/src/mir/mono.rs
@@ -453,8 +453,6 @@ impl CodegenUnitNameBuilder<'tcx> {
         C: fmt::Display,
         S: fmt::Display,
     {
-        use std::fmt::Write;
-
         let mut cgu_name = String::with_capacity(64);
 
         // Start out with the crate name and disambiguator
diff --git a/compiler/rustc_mir/src/interpret/validity.rs b/compiler/rustc_mir/src/interpret/validity.rs
@@ -5,7 +5,6 @@
 //! to be const-safe.
 
 use std::convert::TryFrom;
-use std::fmt::Write;
 use std::num::NonZeroUsize;
 use std::ops::RangeInclusive;
 
diff --git a/compiler/rustc_mir/src/util/pretty.rs b/compiler/rustc_mir/src/util/pretty.rs
@@ -1,5 +1,4 @@
 use std::collections::BTreeSet;
-use std::fmt::Write as _;
 use std::fmt::{Debug, Display};
 use std::fs;
 use std::io::{self, Write};
diff --git a/compiler/rustc_symbol_mangling/src/v0.rs b/compiler/rustc_symbol_mangling/src/v0.rs
@@ -9,7 +9,6 @@ use rustc_middle::ty::subst::{GenericArg, GenericArgKind, Subst};
 use rustc_middle::ty::{self, Instance, Ty, TyCtxt, TypeFoldable};
 use rustc_target::spec::abi::Abi;
 
-use std::fmt::Write;
 use std::ops::Range;
 
 pub(super) fn mangle(
diff --git a/compiler/rustc_trait_selection/src/traits/specialize/mod.rs b/compiler/rustc_trait_selection/src/traits/specialize/mod.rs
@@ -462,8 +462,6 @@ fn report_conflicting_impls(
 /// Recovers the "impl X for Y" signature from `impl_def_id` and returns it as a
 /// string.
 fn to_pretty_impl_header(tcx: TyCtxt<'_>, impl_def_id: DefId) -> Option<String> {
-    use std::fmt::Write;
-
     let trait_ref = tcx.impl_trait_ref(impl_def_id)?;
     let mut w = "impl".to_owned();
 
diff --git a/library/alloc/src/string.rs b/library/alloc/src/string.rs
@@ -2206,7 +2206,6 @@ impl<T: fmt::Display + ?Sized> ToString for T {
     // to try to remove it.
     #[inline]
     default fn to_string(&self) -> String {
-        use fmt::Write;
         let mut buf = String::new();
         buf.write_fmt(format_args!("{}", self))
             .expect("a Display implementation returned an error unexpectedly");
diff --git a/library/core/src/fmt/mod.rs b/library/core/src/fmt/mod.rs
@@ -1048,11 +1048,8 @@ pub trait UpperExp {
 /// Please note that using [`write!`] might be preferable. Example:
 ///
 /// ```
-/// use std::fmt::Write;
-///
 /// let mut output = String::new();
-/// write!(&mut output, "Hello {}!", "world")
-///     .expect("Error occurred while trying to write in String");
+/// write!(&mut output, "Hello {}!", "world");
 /// assert_eq!(output, "Hello world!");
 /// ```
 ///
diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs
@@ -348,25 +348,6 @@ macro_rules! r#try {
 /// }
 /// ```
 ///
-/// A module can import both `std::fmt::Write` and `std::io::Write` and call `write!` on objects
-/// implementing either, as objects do not typically implement both. However, the module must
-/// import the traits qualified so their names do not conflict:
-///
-/// ```
-/// use std::fmt::Write as FmtWrite;
-/// use std::io::Write as IoWrite;
-///
-/// fn main() -> Result<(), Box<dyn std::error::Error>> {
-///     let mut s = String::new();
-///     let mut v = Vec::new();
-///
-///     write!(&mut s, "{} {}", "abc", 123)?; // uses fmt::Write::write_fmt
-///     write!(&mut v, "s = {:?}", s)?; // uses io::Write::write_fmt
-///     assert_eq!(v, b"s = \"abc 123\"");
-///     Ok(())
-/// }
-/// ```
-///
 /// Note: This macro can be used in `no_std` setups as well.
 /// In a `no_std` setup you are responsible for the implementation details of the components.
 ///
@@ -416,25 +397,6 @@ macro_rules! write {
 ///     Ok(())
 /// }
 /// ```
-///
-/// A module can import both `std::fmt::Write` and `std::io::Write` and call `write!` on objects
-/// implementing either, as objects do not typically implement both. However, the module must
-/// import the traits qualified so their names do not conflict:
-///
-/// ```
-/// use std::fmt::Write as FmtWrite;
-/// use std::io::Write as IoWrite;
-///
-/// fn main() -> Result<(), Box<dyn std::error::Error>> {
-///     let mut s = String::new();
-///     let mut v = Vec::new();
-///
-///     writeln!(&mut s, "{} {}", "abc", 123)?; // uses fmt::Write::write_fmt
-///     writeln!(&mut v, "s = {:?}", s)?; // uses io::Write::write_fmt
-///     assert_eq!(v, b"s = \"abc 123\\n\"\n");
-///     Ok(())
-/// }
-/// ```
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[allow_internal_unstable(format_args_nl)]
diff --git a/library/core/tests/fmt/builders.rs b/library/core/tests/fmt/builders.rs
@@ -398,8 +398,6 @@ mod debug_map {
     #[test]
     fn test_entry_err() {
         // Ensure errors in a map entry don't trigger panics (#65231)
-        use std::fmt::Write;
-
         struct ErrorFmt;
 
         impl fmt::Debug for ErrorFmt {
diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs
@@ -452,8 +452,6 @@ pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! {
         }
 
         fn fill(&mut self) -> &mut String {
-            use crate::fmt::Write;
-
             let inner = self.inner;
             // Lazily, the first time this gets called, run the actual string formatting.
             self.string.get_or_insert_with(|| {
diff --git a/library/test/src/bench.rs b/library/test/src/bench.rs
@@ -55,7 +55,6 @@ pub struct BenchSamples {
 }
 
 pub fn fmt_bench_samples(bs: &BenchSamples) -> String {
-    use std::fmt::Write;
     let mut output = String::new();
 
     let median = bs.ns_iter_summ.median as usize;
@@ -76,7 +75,6 @@ pub fn fmt_bench_samples(bs: &BenchSamples) -> String {
 
 // Format a number with thousands separators
 fn fmt_thousands_sep(mut n: usize, sep: char) -> String {
-    use std::fmt::Write;
     let mut output = String::new();
     let mut trailing = false;
     for &pow in &[9, 6, 3, 0] {
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs
@@ -1,4 +1,5 @@
 use crate::{t, VERSION};
+#[allow(unused_imports)]
 use std::fmt::Write as _;
 use std::path::{Path, PathBuf};
 use std::process::Command;
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
@@ -92,7 +92,6 @@ impl Buffer {
     // the fmt::Result return type imposed by fmt::Write (and avoiding the trait
     // import).
     crate fn write_fmt(&mut self, v: fmt::Arguments<'_>) {
-        use fmt::Write;
         self.buffer.write_fmt(v).unwrap();
     }
 
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
@@ -7,7 +7,7 @@
 
 use crate::html::escape::Escape;
 
-use std::fmt::{Display, Write};
+use std::fmt::Display;
 use std::iter::Peekable;
 
 use rustc_lexer::{LiteralKind, TokenKind};
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
@@ -29,7 +29,6 @@ use rustc_span::Span;
 use std::borrow::Cow;
 use std::collections::VecDeque;
 use std::default::Default;
-use std::fmt::Write;
 use std::ops::Range;
 use std::str;
 
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
@@ -36,7 +36,7 @@ use std::cmp::Ordering;
 use std::collections::{BTreeMap, VecDeque};
 use std::default::Default;
 use std::ffi::OsStr;
-use std::fmt::{self, Write};
+use std::fmt;
 use std::fs::{self, File};
 use std::io::prelude::*;
 use std::io::{self, BufReader};
diff --git a/src/test/ui/impl-trait/example-calendar.rs b/src/test/ui/impl-trait/example-calendar.rs
@@ -11,8 +11,6 @@
 //!
 //! Originally converted to Rust by [Daniel Keep](https://github.com/DanielKeep).
 
-use std::fmt::Write;
-
 /// Date representation.
 #[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
 struct NaiveDate(i32, u32, u32);
diff --git a/src/test/ui/macros/must-use-in-macro-55516.rs b/src/test/ui/macros/must-use-in-macro-55516.rs
diff --git a/src/test/ui/macros/must-use-in-macro-55516.stderr b/src/test/ui/macros/must-use-in-macro-55516.stderr
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -179,6 +179,7 @@ pub fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec<Misma
 }
 
 fn write_diff(expected: &str, actual: &str, context_size: usize) -> String {
+    #[allow(unused_imports)]
     use std::fmt::Write;
     let mut output = String::new();
     let diff_results = make_diff(expected, actual, context_size);
@@ -3300,6 +3301,7 @@ impl<'test> TestCx<'test> {
         let after = self.normalize_output(&after, &[]);
         let mut dumped_string = String::new();
         for result in diff::lines(&before, &after) {
+            #[allow(unused_imports)]
             use std::fmt::Write;
             match result {
                 diff::Result::Left(s) => writeln!(dumped_string, "- {}", s).unwrap(),

Original file line number	Diff line number	Diff line change
`@@ -453,8 +453,6 @@ impl CodegenUnitNameBuilder<'tcx> {`
`453`	`453`	`C: fmt::Display,`
`454`	`454`	`S: fmt::Display,`
`455`	`455`	`{`
`456`		`- use std::fmt::Write;`
`457`		`-`
`458`	`456`	`let mut cgu_name = String::with_capacity(64);`
`459`	`457`
`460`	`458`	`// Start out with the crate name and disambiguator`