Skip to content

Commit 120b2a7

Browse files
committedFeb 3, 2021
Auto merge of #81718 - m-ou-se:rollup-3ftbymt, r=m-ou-se
Rollup of 5 pull requests Successful merges: - #80394 (make const_err a future incompat lint) - #81532 (Remove incorrect `delay_span_bug`) - #81692 (Update clippy) - #81715 (Reduce tab formatting assertions to debug only) - #81716 (Fix non-existent-field ICE for generic fields.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 186f7ae + 4617418 commit 120b2a7

File tree

149 files changed

+1497
-395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+1497
-395
lines changed
 

‎compiler/rustc_errors/src/emitter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ impl EmitterWriter {
645645
margin: Margin,
646646
) {
647647
// Tabs are assumed to have been replaced by spaces in calling code.
648-
assert!(!source_string.contains('\t'));
648+
debug_assert!(!source_string.contains('\t'));
649649
let line_len = source_string.len();
650650
// Create the source line we will highlight.
651651
let left = margin.left(line_len);

‎compiler/rustc_errors/src/styled_buffer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl StyledBuffer {
1515

1616
pub fn render(&self) -> Vec<Vec<StyledString>> {
1717
// Tabs are assumed to have been replaced by spaces in calling code.
18-
assert!(self.text.iter().all(|r| !r.contains(&'\t')));
18+
debug_assert!(self.text.iter().all(|r| !r.contains(&'\t')));
1919

2020
let mut output: Vec<Vec<StyledString>> = vec![];
2121
let mut styled_vec: Vec<StyledString> = vec![];

0 commit comments

Comments
 (0)
Please sign in to comment.