From 7b0bafe74973977c1c2c3f85b3a50e3e522d053c Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Fri, 10 Aug 2018 19:01:54 +0100 Subject: [PATCH] Don't accept none str literals for the format string in writeln --- src/libcore/macros.rs | 8 +++---- src/test/ui/macros/issue-30143.rs | 21 ++++++++++++++++++ src/test/ui/macros/issue-30143.stderr | 32 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 src/test/ui/macros/issue-30143.rs create mode 100644 src/test/ui/macros/issue-30143.stderr diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 83f9dfea8f267..5b3b2d1635688 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -396,6 +396,7 @@ macro_rules! write { /// ``` #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] +#[allow_internal_unstable] macro_rules! writeln { ($dst:expr) => ( write!($dst, "\n") @@ -403,11 +404,8 @@ macro_rules! writeln { ($dst:expr,) => ( writeln!($dst) ); - ($dst:expr, $fmt:expr) => ( - write!($dst, concat!($fmt, "\n")) - ); - ($dst:expr, $fmt:expr, $($arg:tt)*) => ( - write!($dst, concat!($fmt, "\n"), $($arg)*) + ($dst:expr, $($arg:tt)*) => ( + $dst.write_fmt(format_args_nl!($($arg)*)) ); } diff --git a/src/test/ui/macros/issue-30143.rs b/src/test/ui/macros/issue-30143.rs new file mode 100644 index 0000000000000..b7fb5b3af999a --- /dev/null +++ b/src/test/ui/macros/issue-30143.rs @@ -0,0 +1,21 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use std::fmt::Write; + +fn main() { + println!(0); + //~^ ERROR format argument must be a string literal + eprintln!('a'); + //~^ ERROR format argument must be a string literal + let mut s = String::new(); + writeln!(s, true).unwrap(); + //~^ ERROR format argument must be a string literal +} diff --git a/src/test/ui/macros/issue-30143.stderr b/src/test/ui/macros/issue-30143.stderr new file mode 100644 index 0000000000000..56834f68f847c --- /dev/null +++ b/src/test/ui/macros/issue-30143.stderr @@ -0,0 +1,32 @@ +error: format argument must be a string literal + --> $DIR/issue-30143.rs:14:14 + | +LL | println!(0); + | ^ +help: you might be missing a string literal to format with + | +LL | println!("{}", 0); + | ^^^^^ + +error: format argument must be a string literal + --> $DIR/issue-30143.rs:16:15 + | +LL | eprintln!('a'); + | ^^^ +help: you might be missing a string literal to format with + | +LL | eprintln!("{}", 'a'); + | ^^^^^ + +error: format argument must be a string literal + --> $DIR/issue-30143.rs:19:17 + | +LL | writeln!(s, true).unwrap(); + | ^^^^ +help: you might be missing a string literal to format with + | +LL | writeln!(s, "{}", true).unwrap(); + | ^^^^^ + +error: aborting due to 3 previous errors +