Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fa2f56a

Browse files
epageepage
committedFeb 12, 2025·
fix: Remove trailing pipe
1 parent 32dc464 commit fa2f56a

23 files changed

+42
-160
lines changed
 

‎examples/expected_type.svg

Lines changed: 2 additions & 4 deletions
Loading

‎examples/footer.svg

Lines changed: 4 additions & 6 deletions
Loading

‎examples/format.svg

Lines changed: 2 additions & 4 deletions
Loading

‎examples/multislice.svg

Lines changed: 5 additions & 9 deletions
Loading

‎src/renderer/display_list.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
//! 152 | | return "test";
2121
//! 153 | | }
2222
//! | |___^ error: expected `String`, for `&str`.
23-
//! |
2423
//! ```
2524
//!
2625
//! The first two lines of the example above are `Raw` lines, while the rest
@@ -1013,7 +1012,6 @@ fn format_message(
10131012
sets.push(format_snippet(
10141013
snippet,
10151014
idx == 0,
1016-
!footer.is_empty(),
10171015
term_width,
10181016
anonymized_line_numbers,
10191017
));
@@ -1092,7 +1090,6 @@ fn format_label(
10921090
fn format_snippet(
10931091
snippet: snippet::Snippet<'_>,
10941092
is_first: bool,
1095-
has_footer: bool,
10961093
term_width: usize,
10971094
anonymized_line_numbers: bool,
10981095
) -> DisplaySet<'_> {
@@ -1102,7 +1099,6 @@ fn format_snippet(
11021099
let mut body = format_body(
11031100
snippet,
11041101
need_empty_header,
1105-
has_footer,
11061102
term_width,
11071103
anonymized_line_numbers,
11081104
);
@@ -1290,7 +1286,6 @@ fn fold_body(body: Vec<DisplayLine<'_>>) -> Vec<DisplayLine<'_>> {
12901286
fn format_body(
12911287
snippet: snippet::Snippet<'_>,
12921288
need_empty_header: bool,
1293-
has_footer: bool,
12941289
term_width: usize,
12951290
anonymized_line_numbers: bool,
12961291
) -> DisplaySet<'_> {
@@ -1605,21 +1600,6 @@ fn format_body(
16051600
);
16061601
}
16071602

1608-
if has_footer {
1609-
body.push(DisplayLine::Source {
1610-
lineno: None,
1611-
inline_marks: vec![],
1612-
line: DisplaySourceLine::Empty,
1613-
annotations: vec![],
1614-
});
1615-
} else if let Some(DisplayLine::Source { .. }) = body.last() {
1616-
body.push(DisplayLine::Source {
1617-
lineno: None,
1618-
inline_marks: vec![],
1619-
line: DisplaySourceLine::Empty,
1620-
annotations: vec![],
1621-
});
1622-
}
16231603
let max_line_num_len = if anonymized_line_numbers {
16241604
ANONYMIZED_LINE_NUM.len()
16251605
} else {

‎tests/fixtures/color/ann_eof.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/ann_insertion.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/ann_multiline.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/ann_multiline2.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/ann_removed_nl.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/ensure-emoji-highlight-width.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/fold_ann_multiline.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/fold_bad_origin_line.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/fold_leading.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/fold_trailing.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/issue_9.svg

Lines changed: 5 additions & 11 deletions
Loading

‎tests/fixtures/color/multiple_annotations.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/simple.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/strip_line.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/strip_line_char.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/fixtures/color/strip_line_non_ws.svg

Lines changed: 1 addition & 3 deletions
Loading

‎tests/formatter.rs

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ error: oops
1616
|
1717
2 | Second oops line
1818
| ^^^^ oops
19-
|
2019
"#]];
2120

2221
let renderer = Renderer::plain();
@@ -37,7 +36,6 @@ error
3736
|
3837
1 | こんにちは、世界
3938
| ^^^^ world
40-
|
4139
"#]];
4240

4341
let renderer = Renderer::plain();
@@ -60,7 +58,6 @@ error
6058
| _____^
6159
2 | | ございます
6260
| |______^ Good morning
63-
|
6461
"#]];
6562

6663
let renderer = Renderer::plain();
@@ -84,7 +81,6 @@ error
8481
| ^^^^^^ Sushi1
8582
2 | 食べたい🍣
8683
| ---- note: Sushi2
87-
|
8884
"#]];
8985

9086
let renderer = Renderer::plain();
@@ -105,7 +101,6 @@ error
105101
|
106102
1 | こんにちは、新しいWorld！
107103
| ^^^^^^^^^^^ New world
108-
|
109104
"#]];
110105

111106
let renderer = Renderer::plain();
@@ -133,7 +128,6 @@ error
133128
|
134129
5402 | This is line 1
135130
5403 | This is line 2
136-
|
137131
"#]];
138132
let renderer = Renderer::plain();
139133
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -152,11 +146,9 @@ error
152146
--> file1.rs
153147
|
154148
5402 | This is slice 1
155-
|
156149
::: file2.rs
157150
|
158151
2 | This is slice 2
159-
|
160152
"#]];
161153
let renderer = Renderer::plain();
162154
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -180,7 +172,6 @@ error
180172
5402 | This is line 1
181173
5403 | This is line 2
182174
| -- info: Test annotation
183-
|
184175
"#]];
185176
let renderer = Renderer::plain();
186177
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -224,7 +215,6 @@ error
224215
|
225216
56 | This is an example
226217
57 | of content lines
227-
|
228218
"#]];
229219
let renderer = Renderer::plain();
230220
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -243,7 +233,6 @@ error
243233
|
244234
1 | tests
245235
| ----- help: Example string
246-
|
247236
"#]];
248237
let renderer = Renderer::plain();
249238
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -266,7 +255,6 @@ error
266255
| |
267256
| help: Example string
268257
| help: Second line
269-
|
270258
"#]];
271259
let renderer = Renderer::plain();
272260
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -281,7 +269,6 @@ fn test_only_source() {
281269
error
282270
--> file.rs
283271
|
284-
|
285272
"#]];
286273
let renderer = Renderer::plain();
287274
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -300,7 +287,6 @@ LL | This is an example
300287
LL | of content lines
301288
LL |
302289
LL | abc
303-
|
304290
"#]];
305291
let renderer = Renderer::plain().anonymized_line_numbers(true);
306292
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -323,7 +309,6 @@ error: dummy
323309
4 | / bar
324310
5 | | baz
325311
| |___^
326-
|
327312
"#]];
328313
let renderer = Renderer::plain();
329314
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -349,7 +334,6 @@ error
349334
3 | / a"
350335
4 | | // ...
351336
| |_______^
352-
|
353337
"#]];
354338
let renderer = Renderer::plain().anonymized_line_numbers(false);
355339
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -371,7 +355,7 @@ error
371355
3 | a
372356
| ^
373357
4 | b
374-
|"#]];
358+
"#]];
375359
let renderer = Renderer::plain().anonymized_line_numbers(false);
376360
assert_data_eq!(renderer.render(input).to_string(), expected);
377361
}
@@ -392,7 +376,7 @@ error
392376
3 | a
393377
| ^
394378
4 | b
395-
|"#]];
379+
"#]];
396380
let renderer = Renderer::plain().anonymized_line_numbers(false);
397381
assert_data_eq!(renderer.render(input).to_string(), expected);
398382
}
@@ -413,7 +397,6 @@ error
413397
| ^^
414398
2 | にちは
415399
3 | 世界
416-
|
417400
"#]];
418401

419402
let renderer = Renderer::plain();
@@ -436,7 +419,7 @@ error
436419
3 | a
437420
| ^
438421
4 | b
439-
|"#]];
422+
"#]];
440423
let renderer = Renderer::plain().anonymized_line_numbers(false);
441424
assert_data_eq!(renderer.render(input).to_string(), expected);
442425
}
@@ -457,7 +440,7 @@ error
457440
3 | a
458441
| ^
459442
4 | b
460-
|"#]];
443+
"#]];
461444
let renderer = Renderer::plain().anonymized_line_numbers(false);
462445
assert_data_eq!(renderer.render(input).to_string(), expected);
463446
}
@@ -478,7 +461,7 @@ error
478461
3 | a
479462
| ^
480463
4 | b
481-
|"#]];
464+
"#]];
482465
let renderer = Renderer::plain().anonymized_line_numbers(false);
483466
assert_data_eq!(renderer.render(input).to_string(), expected);
484467
}
@@ -499,7 +482,7 @@ error
499482
3 | a
500483
| ^
501484
4 | b
502-
|"#]];
485+
"#]];
503486
let renderer = Renderer::plain().anonymized_line_numbers(false);
504487
assert_data_eq!(renderer.render(input).to_string(), expected);
505488
}
@@ -520,7 +503,6 @@ error
520503
| ^
521504
2 | にちは
522505
3 | 世界
523-
|
524506
"#]];
525507

526508
let renderer = Renderer::plain();
@@ -544,7 +526,7 @@ error
544526
| __^
545527
4 | | b
546528
| |_^
547-
|"#]];
529+
"#]];
548530
let renderer = Renderer::plain().anonymized_line_numbers(false);
549531
assert_data_eq!(renderer.render(input).to_string(), expected);
550532
}
@@ -566,7 +548,7 @@ error
566548
| __^
567549
4 | | b
568550
| |_^
569-
|"#]];
551+
"#]];
570552
let renderer = Renderer::plain().anonymized_line_numbers(false);
571553
assert_data_eq!(renderer.render(input).to_string(), expected);
572554
}
@@ -588,7 +570,7 @@ error
588570
| __^
589571
4 | | b
590572
| |_^
591-
|"#]];
573+
"#]];
592574
let renderer = Renderer::plain().anonymized_line_numbers(false);
593575
assert_data_eq!(renderer.render(input).to_string(), expected);
594576
}
@@ -610,7 +592,6 @@ error
610592
2 | | にちは
611593
| |__^
612594
3 | 世界
613-
|
614595
"#]];
615596

616597
let renderer = Renderer::plain();
@@ -635,7 +616,6 @@ error
635616
4 | | b
636617
| |__^
637618
5 | c
638-
|
639619
"#]];
640620
let renderer = Renderer::plain().anonymized_line_numbers(false);
641621
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -659,7 +639,6 @@ error
659639
4 | | b
660640
| |__^
661641
5 | c
662-
|
663642
"#]];
664643
let renderer = Renderer::plain().anonymized_line_numbers(false);
665644
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -683,7 +662,6 @@ error
683662
4 | | b
684663
| |__^
685664
5 | c
686-
|
687665
"#]];
688666
let renderer = Renderer::plain().anonymized_line_numbers(false);
689667
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -706,7 +684,6 @@ error
706684
| __^
707685
4 | | b
708686
| |__^
709-
|
710687
"#]];
711688
let renderer = Renderer::plain().anonymized_line_numbers(false);
712689
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -729,7 +706,6 @@ error
729706
| ___^
730707
4 | | に
731708
| |___^
732-
|
733709
"#]];
734710
let renderer = Renderer::plain().anonymized_line_numbers(false);
735711
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -761,7 +737,6 @@ error: unused optional dependency
761737
| ^^^ --------------- info: This should also be long but not too long
762738
| |
763739
| I need this to be really long so I can test overlaps
764-
|
765740
"#]];
766741
let renderer = Renderer::plain().anonymized_line_numbers(false);
767742
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -799,7 +774,6 @@ error: unused optional dependency
799774
6 | | so is this
800775
7 | | bar = { version = "0.1.0", optional = true }
801776
| |__________________________________________^ I need this to be really long so I can test overlaps
802-
|
803777
"#]];
804778
let renderer = Renderer::plain();
805779
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -845,7 +819,6 @@ error: unused optional dependency
845819
| ||_________________________^________________^ I need this to be really long so I can test overlaps
846820
| |__________________________|
847821
| I need this to be really long so I can test overlaps
848-
|
849822
"#]];
850823
let renderer = Renderer::plain();
851824
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -900,7 +873,6 @@ error: unused optional dependency
900873
| | I need this to be really long so I can test overlaps
901874
8 | | this is another line
902875
| |____^ I need this to be really long so I can test overlaps
903-
|
904876
"#]];
905877
let renderer = Renderer::plain();
906878
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -925,7 +897,6 @@ error: title
925897
3 | ccc
926898
| ^^^ annotation
927899
4 | ddd
928-
|
929900
"#]];
930901
let renderer = Renderer::plain();
931902
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -950,7 +921,6 @@ error: title
950921
3 | ccc
951922
| ^^ annotation
952923
4 | ddd
953-
|
954924
"#]];
955925
let renderer = Renderer::plain();
956926
assert_data_eq!(renderer.render(input).to_string(), expected);

‎tests/rustc_tests.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ error: foo
2828
| __________^
2929
3 | | }
3030
| |_^ test
31-
|
3231
"#]];
3332
let renderer = Renderer::plain();
3433
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -59,7 +58,6 @@ error: foo
5958
4 | |
6059
5 | | }
6160
| |___^ test
62-
|
6361
"#]];
6462
let renderer = Renderer::plain();
6563
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -98,7 +96,6 @@ error: foo
9896
| ||____^__- `Y` is a good letter too
9997
| |_____|
10098
| `X` is a good letter
101-
|
10299
"#]];
103100
let renderer = Renderer::plain();
104101
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -135,7 +132,6 @@ error: foo
135132
| ||____-__^ `X` is a good letter
136133
| |____|
137134
| `Y` is a good letter too
138-
|
139135
"#]];
140136
let renderer = Renderer::plain();
141137
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -175,7 +171,6 @@ error: foo
175171
| ||____^ `X` is a good letter
176172
6 | | X3 Y3 Z3
177173
| |____- `Y` is a good letter too
178-
|
179174
"#]];
180175
let renderer = Renderer::plain();
181176
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -217,7 +212,6 @@ error: foo
217212
| ||_____|__|
218213
| |______| `Y` is a good letter too
219214
| `X` is a good letter
220-
|
221215
"#]];
222216
let renderer = Renderer::plain();
223217
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -259,7 +253,6 @@ error: foo
259253
| `X` is a good letter
260254
| `Y` is a good letter too
261255
| `Z` label
262-
|
263256
"#]];
264257
let renderer = Renderer::plain();
265258
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -304,7 +297,6 @@ error: foo
304297
| |
305298
6 | | X3 Y3 Z3
306299
| |_______- `Z`
307-
|
308300
"#]];
309301
let renderer = Renderer::plain();
310302
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -343,7 +335,6 @@ error: foo
343335
| ______-
344336
6 | | X3 Y3 Z3
345337
| |__________- `Y` is a good letter too
346-
|
347338
"#]];
348339
let renderer = Renderer::plain();
349340
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -384,7 +375,6 @@ error: foo
384375
5 | | X2 Y2 Z2
385376
6 | | X3 Y3 Z3
386377
| |__________- `Y` is a good letter too
387-
|
388378
"#]];
389379
let renderer = Renderer::plain();
390380
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -412,7 +402,6 @@ error: foo
412402
|
413403
3 | a { b { c } d }
414404
| ----^^^^-^^-- `a` is a good letter
415-
|
416405
"#]];
417406
let renderer = Renderer::plain();
418407
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -439,7 +428,6 @@ error: foo
439428
|
440429
3 | a { b { c } d }
441430
| ^^^^-------^^ `a` is a good letter
442-
|
443431
"#]];
444432
let renderer = Renderer::plain();
445433
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -469,7 +457,6 @@ error: foo
469457
| ----^^^^-^^--
470458
| |
471459
| `b` is a good letter
472-
|
473460
"#]];
474461
let renderer = Renderer::plain();
475462
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -498,7 +485,6 @@ error: foo
498485
| ^^^^-------^^
499486
| |
500487
| `b` is a good letter
501-
|
502488
"#]];
503489
let renderer = Renderer::plain();
504490
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -527,7 +513,6 @@ error: foo
527513
| ^^^^----
528514
| |
529515
| `a` is a good letter
530-
|
531516
"#]];
532517
let renderer = Renderer::plain();
533518
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -554,7 +539,6 @@ error: foo
554539
|
555540
3 | a { b { c } d }
556541
| ^^^^-------^^
557-
|
558542
"#]];
559543
let renderer = Renderer::plain();
560544
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -582,7 +566,6 @@ error: foo
582566
|
583567
3 | a { b { c } d }
584568
| ----^^^^-^^--
585-
|
586569
"#]];
587570
let renderer = Renderer::plain();
588571
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -612,7 +595,6 @@ error: foo
612595
| | |
613596
| | `b` is a good letter
614597
| `a` is a good letter
615-
|
616598
"#]];
617599
let renderer = Renderer::plain();
618600
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -638,7 +620,6 @@ error: foo
638620
|
639621
3 | a { b { c } d }
640622
| ^^^^^^^^^^^^^ `a` is a good letter
641-
|
642623
"#]];
643624
let renderer = Renderer::plain();
644625
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -664,7 +645,6 @@ error: foo
664645
|
665646
3 | a { b { c } d }
666647
| ^^^^^^^^^^^^^
667-
|
668648
"#]];
669649
let renderer = Renderer::plain();
670650
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -717,7 +697,6 @@ error: foo
717697
15 | | X2 Y2 Z2
718698
16 | | X3 Y3 Z3
719699
| |__________- `Y` is a good letter too
720-
|
721700
"#]];
722701
let renderer = Renderer::plain();
723702
assert_data_eq!(renderer.render(input).to_string(), expected);
@@ -776,7 +755,6 @@ error: foo
776755
15 | | 10
777756
16 | | X3 Y3 Z3
778757
| |________^ `Y` is a good letter
779-
|
780758
"#]];
781759
let renderer = Renderer::plain();
782760
assert_data_eq!(renderer.render(input).to_string(), expected);

0 commit comments

Comments
 (0)
Please sign in to comment.