diff options
| author | bors <bors@rust-lang.org> | 2022-11-24 00:17:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-24 00:17:35 +0000 |
| commit | 872631d0f0fadffe3220ab1bd9c8f1f2342341e2 (patch) | |
| tree | 6721d534b4d7f5b0e7c364c451ffb6b792bfdea7 /compiler/rustc_errors/src | |
| parent | 70f8737b2f5d3bf7d6b784fad00b663b7ff9feda (diff) | |
| parent | 94470f4efd2ec0786dd1f201e9ea84651b4bb0d0 (diff) | |
| download | rust-872631d0f0fadffe3220ab1bd9c8f1f2342341e2.tar.gz rust-872631d0f0fadffe3220ab1bd9c8f1f2342341e2.zip | |
Auto merge of #104507 - WaffleLapkin:asderefsyou, r=wesleywiser
Use `as_deref` in compiler (but only where it makes sense) This simplifies some code :3 (there are some changes that are not exacly `as_deref`, but more like "clever `Option`/`Result` method use")
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index bc136aea44d..bf20c7431e4 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -248,7 +248,7 @@ pub trait Emitter: Translate { fluent_args: &FluentArgs<'_>, ) -> (MultiSpan, &'a [CodeSuggestion]) { let mut primary_span = diag.span.clone(); - let suggestions = diag.suggestions.as_ref().map_or(&[][..], |suggestions| &suggestions[..]); + let suggestions = diag.suggestions.as_deref().unwrap_or(&[]); if let Some((sugg, rest)) = suggestions.split_first() { let msg = self.translate_message(&sugg.msg, fluent_args); if rest.is_empty() && |