Skip to content

Commit 9b79370

Browse files
authored
Rollup merge of rust-lang#58118 - h-michael:libtest-theme-2018, r=Centril
Transition libtest to 2018 edition Transitions libtest to Rust 2018; cc rust-lang#58099 r? @Centril
2 parents 1efdda1 + 3c67873 commit 9b79370

File tree

4 files changed

+104
-71
lines changed

4 files changed

+104
-71
lines changed

src/libtest/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
authors = ["The Rust Project Developers"]
33
name = "test"
44
version = "0.0.0"
5+
edition = "2018"
56

67
[lib]
78
name = "test"

src/libtest/formatters/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> {
145145
struct EscapedString<S: AsRef<str>>(S);
146146

147147
impl<S: AsRef<str>> ::std::fmt::Display for EscapedString<S> {
148-
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
148+
fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
149149
let mut start = 0;
150150

151151
for (i, byte) in self.0.as_ref().bytes().enumerate() {

0 commit comments

Comments
 (0)