Skip to content

Commit 8d18281

Browse files
committed
merge: preserve ascii-art formatting in Merge::flatten doc-comment
Rustdoc was losing the formatting of these merge diagrams; preserve it with code-block formatting.
1 parent 75fa7de commit 8d18281

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lib/src/merge.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,15 +486,19 @@ impl<T> Merge<Merge<T>> {
486486
///
487487
/// Let's say we have a 3-way merge of 3-way merges like this:
488488
///
489+
/// ```
489490
/// 4 5 7 8
490491
/// 3 6
491492
/// 1 2
492493
/// 0
494+
/// ```
493495
///
494496
/// Flattening that results in this 9-way merge:
495497
///
498+
/// ```
496499
/// 4 5 0 7 8
497500
/// 3 2 1 6
501+
/// ```
498502
pub fn flatten(self) -> Merge<T> {
499503
let mut outer_values = self.values.into_iter();
500504
let mut result = outer_values.next().unwrap();

0 commit comments

Comments
 (0)