diff options
| author | bors <bors@rust-lang.org> | 2021-02-02 14:52:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-02 14:52:53 +0000 |
| commit | b81f5811f96fe750ab28c15219d1b0dba6b1dc90 (patch) | |
| tree | de4308cb542bc90db1f8bfb1bdc1d28b6478b4ab /compiler/rustc_errors/src | |
| parent | a3ed564c130ec3f19e933a9ea31faca5a717ce91 (diff) | |
| parent | d5b760ba62b40dd770c09e704b8a3af64c1fd058 (diff) | |
| download | rust-b81f5811f96fe750ab28c15219d1b0dba6b1dc90.tar.gz rust-b81f5811f96fe750ab28c15219d1b0dba6b1dc90.zip | |
Auto merge of #80843 - Mark-Simulacrum:fmt-bump, r=petrochenkov
Bump rustfmt version
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic_builder.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/snippet.rs | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/compiler/rustc_errors/src/diagnostic_builder.rs b/compiler/rustc_errors/src/diagnostic_builder.rs index 37902dddff4..c09cce21bf2 100644 --- a/compiler/rustc_errors/src/diagnostic_builder.rs +++ b/compiler/rustc_errors/src/diagnostic_builder.rs @@ -36,7 +36,7 @@ macro_rules! forward_inner_docs { ($e:expr => $i:item) => { #[doc = $e] $i - } + }; } /// In general, the `DiagnosticBuilder` uses deref to allow access to diff --git a/compiler/rustc_errors/src/snippet.rs b/compiler/rustc_errors/src/snippet.rs index dbb2523f286..acb88e57db5 100644 --- a/compiler/rustc_errors/src/snippet.rs +++ b/compiler/rustc_errors/src/snippet.rs @@ -122,11 +122,13 @@ impl Annotation { } pub fn is_multiline(&self) -> bool { - matches!(self.annotation_type, + matches!( + self.annotation_type, AnnotationType::Multiline(_) - | AnnotationType::MultilineStart(_) - | AnnotationType::MultilineLine(_) - | AnnotationType::MultilineEnd(_)) + | AnnotationType::MultilineStart(_) + | AnnotationType::MultilineLine(_) + | AnnotationType::MultilineEnd(_) + ) } pub fn len(&self) -> usize { @@ -158,7 +160,10 @@ impl Annotation { pub fn takes_space(&self) -> bool { // Multiline annotations always have to keep vertical space. - matches!(self.annotation_type, AnnotationType::MultilineStart(_) | AnnotationType::MultilineEnd(_)) + matches!( + self.annotation_type, + AnnotationType::MultilineStart(_) | AnnotationType::MultilineEnd(_) + ) } } |
