rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #52764 - sinkuu:cleanup, r=nikomatsakis

Browse Source 
Misc cleanups
This commit is contained in:
bors
2018-07-29 06:32:24 +00:00
parent fb0653e402 e995a91a31
commit a5c2d0fffa
20 changed files with 50 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsyntax/print/pprust.rs
View File

@@ -32,7 +32,7 @@ use tokenstream::{self, TokenStream, TokenTree};
use std::ascii;
use std::io::{self, Write, Read};
use std::iter::{self, Peekable};
use std::iter::Peekable;
use std::vec;
pub enum AnnNode<'a> {
@@ -235,11 +235,11 @@ pub fn token_to_string(tok: &Token) -> String {
token::Integer(c) => c.to_string(),
token::Str_(s) => format!("\"{}\"", s),
token::StrRaw(s, n) => format!("r{delim}\"{string}\"{delim}",
delim=repeat("#", n as usize),
delim="#".repeat(n as usize),
string=s),
token::ByteStr(v) => format!("b\"{}\"", v),
token::ByteStrRaw(s, n) => format!("br{delim}\"{string}\"{delim}",
delim=repeat("#", n as usize),
delim="#".repeat(n as usize),
string=s),
};
@@ -661,7 +661,7 @@ pub trait PrintState<'a> {
}
ast::StrStyle::Raw(n) => {
(format!("r{delim}\"{string}\"{delim}",
delim=repeat("#", n as usize),
delim="#".repeat(n as usize),
string=st))
}
};
@@ -3180,8 +3180,6 @@ impl<'a> State<'a> {
}
}
fn repeat(s: &str, n: usize) -> String { iter::repeat(s).take(n).collect() }
#[cfg(test)]
mod tests {
use super::*;