user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't use .into() to convert types into identical types.

Browse source 
example:
    let s: String = format!("hello").into();
This commit is contained in:
Matthias Krüger 2020-02-25 18:10:34 +01:00
parent 49c68bd53f
commit 7be94a8a95
32 changed files with 42 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_parse/lexer/mod.rs
View file

@ -327,8 +327,7 @@ impl<'a> StringReader<'a> {
match kind {
rustc_lexer::LiteralKind::Char { terminated } => {
if !terminated {
self.fatal_span_(start, suffix_start, "unterminated character literal".into())
.raise()
self.fatal_span_(start, suffix_start, "unterminated character literal").raise()
}
let content_start = start + BytePos(1);
let content_end = suffix_start - BytePos(1);
@ -338,12 +337,8 @@ impl<'a> StringReader<'a> {
}
rustc_lexer::LiteralKind::Byte { terminated } => {
if !terminated {
self.fatal_span_(
start + BytePos(1),
suffix_start,
"unterminated byte constant".into(),
)
.raise()
self.fatal_span_(start + BytePos(1), suffix_start, "unterminated byte constant")
.raise()
}
let content_start = start + BytePos(2);
let content_end = suffix_start - BytePos(1);
@ -353,7 +348,7 @@ impl<'a> StringReader<'a> {
}
rustc_lexer::LiteralKind::Str { terminated } => {
if !terminated {
self.fatal_span_(start, suffix_start, "unterminated double quote string".into())
self.fatal_span_(start, suffix_start, "unterminated double quote string")
.raise()
}
let content_start = start + BytePos(1);
@ -367,7 +362,7 @@ impl<'a> StringReader<'a> {
self.fatal_span_(
start + BytePos(1),
suffix_start,
"unterminated double quote byte string".into(),
"unterminated double quote byte string",
)
.raise()
}

2
src/librustc_parse/lexer/tokentrees.rs
View file

@ -212,7 +212,7 @@ impl<'a> TokenTreesReader<'a> {
_ => {}
}
Ok(TokenTree::Delimited(delim_span, delim, tts.into()).into())
Ok(TokenTree::Delimited(delim_span, delim, tts).into())
}
token::CloseDelim(delim) => {
// An unexpected closing delimiter (i.e., there is no

2
src/librustc_parse/lib.rs
View file

@ -420,7 +420,7 @@ fn prepend_attrs(
builder.push(tokenstream::TokenTree::Delimited(
delim_span,
token::DelimToken::Bracket,
brackets.build().into(),
brackets.build(),
));
}
builder.push(tokens.clone());

7
src/librustc_parse/parser/mod.rs
View file

@ -263,8 +263,7 @@ impl TokenCursor {
]
.iter()
.cloned()
.collect::<TokenStream>()
.into(),
.collect::<TokenStream>(),
);
self.stack.push(mem::replace(
@ -389,7 +388,7 @@ impl<'a> Parser<'a> {
root_module_name: None,
expected_tokens: Vec::new(),
token_cursor: TokenCursor {
frame: TokenCursorFrame::new(DelimSpan::dummy(), token::NoDelim, &tokens.into()),
frame: TokenCursorFrame::new(DelimSpan::dummy(), token::NoDelim, &tokens),
stack: Vec::new(),
},
desugar_doc_comments,
@ -1006,7 +1005,7 @@ impl<'a> Parser<'a> {
);
self.set_token(Token::new(TokenKind::CloseDelim(frame.delim), frame.span.close));
self.bump();
TokenTree::Delimited(frame.span, frame.delim, frame.tree_cursor.stream.into())
TokenTree::Delimited(frame.span, frame.delim, frame.tree_cursor.stream)
}
token::CloseDelim(_) | token::Eof => unreachable!(),
_ => {

2
src/librustc_parse/parser/stmt.rs
View file

@ -169,7 +169,7 @@ impl<'a> Parser<'a> {
}
fn parse_local_mk(&mut self, lo: Span, attrs: AttrVec) -> PResult<'a, Stmt> {
let local = self.parse_local(attrs.into())?;
let local = self.parse_local(attrs)?;
Ok(self.mk_stmt(lo.to(self.prev_span), StmtKind::Local(local)))
}