diff options
| author | bors <bors@rust-lang.org> | 2022-08-06 23:38:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-06 23:38:28 +0000 |
| commit | cc71eef498a24af884c4ffa288101a73447bfc61 (patch) | |
| tree | 08264d7f0b3f50f0b8353fed508381c608601d6c /compiler/rustc_errors/src | |
| parent | 2befdefdda0f2bc5ff93f7f95633c98841409098 (diff) | |
| parent | ee0b755fe625cd10b11adfaa51f3d0f1e3ca33f0 (diff) | |
| download | rust-cc71eef498a24af884c4ffa288101a73447bfc61.tar.gz rust-cc71eef498a24af884c4ffa288101a73447bfc61.zip | |
Auto merge of #100213 - matthiaskrgr:rollup-mqe7t1n, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #100071 (deps: dedupe `annotate-snippets` crate versions) - #100127 (Remove Windows function preloading) - #100130 (Avoid pointing out `return` span if it has nothing to do with type error) - #100169 (Optimize `pointer::as_aligned_to`) - #100175 (ascii -> ASCII in code comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs index 0fcd61d1e58..3df562c7eda 100644 --- a/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs +++ b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs @@ -183,7 +183,11 @@ impl AnnotateSnippetEmitterWriter { annotation_type: annotation_type_for_level(*level), }), footer: vec![], - opt: FormatOptions { color: true, anonymized_line_numbers: self.ui_testing }, + opt: FormatOptions { + color: true, + anonymized_line_numbers: self.ui_testing, + margin: None, + }, slices: annotated_files .iter() .map(|(source, line_index, annotations)| { |