diff options
| author | bors <bors@rust-lang.org> | 2025-01-20 10:35:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-20 10:35:43 +0000 |
| commit | b5741a36a897dd93936d31ea0c1688f1399a2e06 (patch) | |
| tree | 26fcbc89de6fdb69fa2dde840efc6754f5ff3a96 /compiler/rustc_errors/src/json.rs | |
| parent | ecda83b30f0f68cf5692855dddc0bc38ee8863fc (diff) | |
| parent | 82a239c798625b23c3de8cefd012f018d403d568 (diff) | |
| download | rust-b5741a36a897dd93936d31ea0c1688f1399a2e06.tar.gz rust-b5741a36a897dd93936d31ea0c1688f1399a2e06.zip | |
Auto merge of #135754 - jieyouxu:rollup-j4q1hpr, r=jieyouxu
Rollup of 7 pull requests
Successful merges:
- #135542 (Add the concrete syntax for precise capturing to 1.82 release notes.)
- #135700 (Emit single privacy error for struct literal with multiple private fields and add test for `default_field_values` privacy)
- #135722 (make it possible to use ci-rustc on tarball sources)
- #135729 (Add debug assertions to compiler profile)
- #135736 (rustdoc: Fix flaky doctest test)
- #135738 (Replace usages of `map_or(bool, ...)` with `is_{some_and|none_or|ok_and}`)
- #135747 (Rename FileName::QuoteExpansion to CfgSpec)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/json.rs')
| -rw-r--r-- | compiler/rustc_errors/src/json.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/json.rs b/compiler/rustc_errors/src/json.rs index 97df7f9265a..c1188665a05 100644 --- a/compiler/rustc_errors/src/json.rs +++ b/compiler/rustc_errors/src/json.rs @@ -463,7 +463,8 @@ impl DiagnosticSpan { // is an empty string, increase the length to include the newline so we don't // leave an empty line if start.col.0 == 0 - && suggestion.map_or(false, |(s, _)| s.is_empty()) + && let Some((suggestion, _)) = suggestion + && suggestion.is_empty() && let Ok(after) = je.sm.span_to_next_source(span) && after.starts_with('\n') { |