bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cleanup: don't manually unwrap_or_default()

Browse source
This commit is contained in:
Matthias Krüger 2024-09-29 12:51:28 +02:00
parent 9903b256a2
commit 1a28599981
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_expand/src/proc_macro_server.rs
View file

@ -627,8 +627,7 @@ impl server::TokenStream for Rustc<'_, '_> {
base: Option<Self::TokenStream>,
trees: Vec<TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>,
) -> Self::TokenStream {
let mut stream =
if let Some(base) = base { base } else { tokenstream::TokenStream::default() };
let mut stream = base.unwrap_or_default();
for tree in trees {
for tt in (tree, &mut *self).to_internal() {
stream.push_tree(tt);
@ -642,8 +641,7 @@ impl server::TokenStream for Rustc<'_, '_> {
base: Option<Self::TokenStream>,
streams: Vec<Self::TokenStream>,
) -> Self::TokenStream {
let mut stream =
if let Some(base) = base { base } else { tokenstream::TokenStream::default() };
let mut stream = base.unwrap_or_default();
for s in streams {
stream.push_stream(s);
}