nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats 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>, base: Option<Self::TokenStream>,
trees: Vec<TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>, trees: Vec<TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>,
) -> Self::TokenStream { ) -> Self::TokenStream {
let mut stream = let mut stream = base.unwrap_or_default();
if let Some(base) = base { base } else { tokenstream::TokenStream::default() };
for tree in trees { for tree in trees {
for tt in (tree, &mut *self).to_internal() { for tt in (tree, &mut *self).to_internal() {
stream.push_tree(tt); stream.push_tree(tt);
@ -642,8 +641,7 @@ impl server::TokenStream for Rustc<'_, '_> {
base: Option<Self::TokenStream>, base: Option<Self::TokenStream>,
streams: Vec<Self::TokenStream>, streams: Vec<Self::TokenStream>,
) -> Self::TokenStream { ) -> Self::TokenStream {
let mut stream = let mut stream = base.unwrap_or_default();
if let Some(base) = base { base } else { tokenstream::TokenStream::default() };
for s in streams { for s in streams {
stream.push_stream(s); stream.push_stream(s);
} }

10
compiler/rustc_hir_typeck/src/upvar.rs
View File

@ -1369,13 +1369,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
for (&var_hir_id, _) in upvars.iter() { for (&var_hir_id, _) in upvars.iter() {
let mut diagnostics_info = Vec::new(); let mut diagnostics_info = Vec::new();
let auto_trait_diagnostic = if let Some(diagnostics_info) = let auto_trait_diagnostic = self
self.compute_2229_migrations_for_trait(min_captures, var_hir_id, closure_clause) .compute_2229_migrations_for_trait(min_captures, var_hir_id, closure_clause)
{ .unwrap_or_default();
diagnostics_info
} else {
FxIndexMap::default()
};
let drop_reorder_diagnostic = if let Some(diagnostics_info) = self let drop_reorder_diagnostic = if let Some(diagnostics_info) = self
.compute_2229_migrations_for_drop( .compute_2229_migrations_for_drop(