1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
doc tests depends on feature
Index: imara-diff/src/lib.rs
===================================================================
--- imara-diff.orig/src/lib.rs
+++ imara-diff/src/lib.rs
@@ -30,14 +30,17 @@
//!
//! ```
//! use imara_diff::intern::InternedInput;
+//! #[cfg(feature = "unified_diff")]
//! use imara_diff::{diff, Algorithm, UnifiedDiffBuilder};
//!
+//! #[cfg(feature = "unified_diff")]
//! let before = r#"fn foo() -> Bar {
//! let mut foo = 2;
//! foo *= 50;
//! println!("hello world")
//! }"#;
//!
+//! #[cfg(feature = "unified_diff")]
//! let after = r#"// lorem ipsum
//! fn foo() -> Bar {
//! let mut foo = 2;
@@ -48,8 +51,11 @@
//! // foo
//! "#;
//!
+//! #[cfg(feature = "unified_diff")]
//! let input = InternedInput::new(before, after);
+//! #[cfg(feature = "unified_diff")]
//! let diff = diff(Algorithm::Histogram, &input, UnifiedDiffBuilder::new(&input));
+//! #[cfg(feature = "unified_diff")]
//! assert_eq!(
//! diff,
//! r#"@@ -1,5 +1,8 @@
@@ -73,14 +79,17 @@
//! use std::ops::Range;
//!
//! use imara_diff::intern::InternedInput;
+//! #[cfg(feature = "unified_diff")]
//! use imara_diff::{diff, Algorithm, UnifiedDiffBuilder};
//!
+//! #[cfg(feature = "unified_diff")]
//! let before = r#"fn foo() -> Bar {
//! let mut foo = 2;
//! foo *= 50;
//! println!("hello world")
//! }"#;
//!
+//! #[cfg(feature = "unified_diff")]
//! let after = r#"// lorem ipsum
//! fn foo() -> Bar {
//! let mut foo = 2;
@@ -91,11 +100,16 @@
//! // foo
//! "#;
//!
+//! #[cfg(feature = "unified_diff")]
//! let mut insertions = Vec::new();
+//! #[cfg(feature = "unified_diff")]
//! let mut removals = Vec::new();
+//! #[cfg(feature = "unified_diff")]
//! let mut replacements = Vec::new();
//!
+//! #[cfg(feature = "unified_diff")]
//! let input = InternedInput::new(before, after);
+//! #[cfg(feature = "unified_diff")]
//! let sink = |before: Range<u32>, after: Range<u32>| {
//! let hunk_before: Vec<_> = input.before[before.start as usize..before.end as usize]
//! .iter()
@@ -113,9 +127,13 @@
//! replacements.push((hunk_before, hunk_after))
//! }
//! };
+//! #[cfg(feature = "unified_diff")]
//! let diff = diff(Algorithm::Histogram, &input, sink);
+//! #[cfg(feature = "unified_diff")]
//! assert_eq!(&insertions, &[vec!["// lorem ipsum"], vec!["// foo"]]);
+//! #[cfg(feature = "unified_diff")]
//! assert!(removals.is_empty());
+//! #[cfg(feature = "unified_diff")]
//! assert_eq!(
//! &replacements,
//! &[(
@@ -133,19 +151,30 @@
//! use imara_diff::intern::InternedInput;
//! use imara_diff::sink::Counter;
//! use imara_diff::sources::lines_with_terminator;
+//! #[cfg(feature = "unified_diff")]
//! use imara_diff::{diff, Algorithm, UnifiedDiffBuilder};
//!
+//! #[cfg(feature = "unified_diff")]
//! let before = "foo";
+//! #[cfg(feature = "unified_diff")]
//! let after = "foo\n";
//!
+//! #[cfg(feature = "unified_diff")]
//! let input = InternedInput::new(before, after);
+//! #[cfg(feature = "unified_diff")]
//! let changes = diff(Algorithm::Histogram, &input, Counter::default());
+//! #[cfg(feature = "unified_diff")]
//! assert_eq!(changes.insertions, 0);
+//! #[cfg(feature = "unified_diff")]
//! assert_eq!(changes.removals, 0);
//!
+//! #[cfg(feature = "unified_diff")]
//! let input = InternedInput::new(lines_with_terminator(before), lines_with_terminator(after));
+//! #[cfg(feature = "unified_diff")]
//! let changes = diff(Algorithm::Histogram, &input, Counter::default());
+//! #[cfg(feature = "unified_diff")]
//! assert_eq!(changes.insertions, 1);
+//! #[cfg(feature = "unified_diff")]
//! assert_eq!(changes.removals, 1);
//! ```
Index: imara-diff/src/tests.rs
===================================================================
--- imara-diff.orig/src/tests.rs
+++ imara-diff/src/tests.rs
@@ -6,8 +6,11 @@ use expect_test::{expect, expect_file};
use crate::intern::InternedInput;
use crate::sink::Counter;
-use crate::{diff, Algorithm, UnifiedDiffBuilder};
+use crate::{diff, Algorithm};
+#[cfg(feature = "unified_diff")]
+use crate::UnifiedDiffBuilder;
+#[cfg(feature = "unified_diff")]
#[test]
fn replace() {
let before = r#"fn foo() -> Bar{
@@ -45,6 +48,7 @@ fn foo() -> Bar{
}
}
+#[cfg(feature = "unified_diff")]
#[test]
fn identical_files() {
let file = r#"fn foo() -> Bar{
@@ -60,6 +64,7 @@ fn identical_files() {
}
}
+#[cfg(feature = "unified_diff")]
#[test]
fn simple_insert() {
let before = r#"fn foo() -> Bar{
@@ -116,6 +121,7 @@ pub fn project_root() -> PathBuf {
res
}
+#[cfg(feature = "unified_diff")]
//#[test]
#[cfg(not(miri))]
fn hand_checked_udiffs() {
|
