Skip to content

Commit 3d83c05

Browse files
bjacotgbjacotg
committed
Use ansi_term since anstyle requires rust 1.64.0
1 parent 71b2c7c commit 3d83c05

File tree

5 files changed

+66
-61
lines changed

5 files changed

+66
-61
lines changed

‎googletest/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ googletest_macro = { path = "../googletest_macro", version = "0.8.0" }
3535
anyhow = { version = "1", optional = true }
3636
num-traits = "0.2.15"
3737
regex = "1.6.0"
38-
anstyle = "1.0.0"
38+
ansi_term = "0.12.0"
3939

4040
[dev-dependencies]
4141
indoc = "2"

‎googletest/src/matchers/display_matcher.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ mod tests {
113113
which displays as a string which isn't equal to \"123\\n345\"
114114
Difference:
115115
123
116-
[1m[31m234[0m
117-
[1m[34m345[0m
116+
[1;31m234[0m
117+
[1;34m345[0m
118118
"
119119
))))
120120
)

‎googletest/src/matchers/eq_deref_of_matcher.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ mod tests {
141141
which isn't equal to Strukt { int: 321, string: "someone" }
142142
Difference:
143143
Strukt {
144-
[1m[31m int: 123,[0m
145-
[1m[34m int: 321,[0m
146-
[1m[31m string: "something",[0m
147-
[1m[34m string: "someone",[0m
144+
[1;31m int: 123,[0m
145+
[1;34m int: 321,[0m
146+
[1;31m string: "something",[0m
147+
[1;34m string: "someone",[0m
148148
}
149149
"#})))
150150
)

‎googletest/src/matchers/eq_matcher.rs‎

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
use anstyle::{Color, Style};
15+
16+
use ansi_term::{Color, Style};
1617

1718
use crate::matcher::{Matcher, MatcherResult};
1819
use crate::matcher_support::edit_distance;
@@ -180,31 +181,35 @@ pub(super) fn create_diff_reversed(
180181
}
181182
}
182183

183-
const EXTRA_LEFT_STYLE: Style =
184-
Style::new().bold().fg_color(Some(Color::Ansi(anstyle::AnsiColor::Red)));
185-
const EXTRA_RIGHT_STYLE: Style =
186-
Style::new().bold().fg_color(Some(Color::Ansi(anstyle::AnsiColor::Blue)));
187-
const COMMENT_STYLE: Style = Style::new().italic();
184+
fn extra_left_style() -> Style {
185+
Style::new().fg(Color::Red).bold()
186+
}
187+
fn extra_right_style() -> Style {
188+
Style::new().fg(Color::Blue).bold()
189+
}
190+
fn comment_style() -> Style {
191+
Style::new().italic()
192+
}
188193

189194
fn edit_list_summary(edit_list: &[edit_distance::Edit<&str>]) -> String {
190195
let mut summary = String::new();
191196
// Use to collect common line and compress them.
192197
let mut common_line_buffer = vec![];
193198
for edit in edit_list {
194-
let (start, line) = match edit {
199+
let (style, line) = match edit {
195200
edit_distance::Edit::Both(left) => {
196201
common_line_buffer.push(*left);
197202
continue;
198203
}
199-
edit_distance::Edit::ExtraLeft(left) => (EXTRA_LEFT_STYLE, *left),
200-
edit_distance::Edit::ExtraRight(right) => (EXTRA_RIGHT_STYLE, *right),
204+
edit_distance::Edit::ExtraLeft(left) => (extra_left_style(), *left),
205+
edit_distance::Edit::ExtraRight(right) => (extra_right_style(), *right),
201206
edit_distance::Edit::AdditionalLeft => {
202-
(COMMENT_STYLE, "<---- remaining lines omitted ---->")
207+
(comment_style(), "<---- remaining lines omitted ---->")
203208
}
204209
};
205210
summary.push_str(&compress_common_lines(std::mem::take(&mut common_line_buffer)));
206211

207-
write!(&mut summary, "\n{}{line}{}", start.render(), start.render_reset()).unwrap();
212+
write!(&mut summary, "\n{}", style.paint(line)).unwrap();
208213
}
209214
summary.push_str(&compress_common_lines(common_line_buffer));
210215

@@ -233,9 +238,9 @@ fn compress_common_lines(common_lines: Vec<&str>) -> String {
233238

234239
truncated_lines.push_str(&format!(
235240
"\n{}<---- {} common lines omitted ---->{}",
236-
COMMENT_STYLE.render(),
241+
comment_style().prefix(),
237242
common_lines.len() - 2 * COMMON_LINES_CONTEXT_SIZE,
238-
COMMENT_STYLE.render_reset(),
243+
comment_style().suffix(),
239244
));
240245

241246
for line in &common_lines[common_lines.len() - COMMON_LINES_CONTEXT_SIZE..common_lines.len()] {
@@ -304,10 +309,10 @@ mod tests {
304309
which isn't equal to Strukt { int: 321, string: "someone" }
305310
Difference:
306311
Strukt {
307-
[1m[31m int: 123,[0m
308-
[1m[34m int: 321,[0m
309-
[1m[31m string: "something",[0m
310-
[1m[34m string: "someone",[0m
312+
[1;31m int: 123,[0m
313+
[1;34m int: 321,[0m
314+
[1;31m string: "something",[0m
315+
[1;34m string: "someone",[0m
311316
}
312317
"#})))
313318
)
@@ -327,9 +332,9 @@ mod tests {
327332
Difference:
328333
[
329334
1,
330-
[1m[31m 2,[0m
335+
[1;31m 2,[0m
331336
3,
332-
[1m[34m 4,[0m
337+
[1;34m 4,[0m
333338
]
334339
"#})))
335340
)
@@ -349,9 +354,9 @@ mod tests {
349354
Difference:
350355
[
351356
1,
352-
[1m[31m 2,[0m
357+
[1;31m 2,[0m
353358
3,
354-
[1m[31m 4,[0m
359+
[1;31m 4,[0m
355360
5,
356361
]
357362
"#})))
@@ -367,15 +372,15 @@ mod tests {
367372
"
368373
Difference:
369374
[
370-
[1m[31m 1,[0m
371-
[1m[31m 2,[0m
375+
[1;31m 1,[0m
376+
[1;31m 2,[0m
372377
3,
373378
4,
374379
<---- 43 common lines omitted ---->
375380
48,
376381
49,
377-
[1m[34m 50,[0m
378-
[1m[34m 51,[0m
382+
[1;34m 50,[0m
383+
[1;34m 51,[0m
379384
]"})))
380385
)
381386
}
@@ -389,15 +394,15 @@ mod tests {
389394
"
390395
Difference:
391396
[
392-
[1m[31m 1,[0m
393-
[1m[31m 2,[0m
397+
[1;31m 1,[0m
398+
[1;31m 2,[0m
394399
3,
395400
4,
396401
5,
397402
6,
398403
7,
399-
[1m[34m 8,[0m
400-
[1m[34m 9,[0m
404+
[1;34m 8,[0m
405+
[1;34m 9,[0m
401406
]"})))
402407
)
403408
}
@@ -415,8 +420,8 @@ mod tests {
415420
<---- 46 common lines omitted ---->
416421
48,
417422
49,
418-
[1m[34m 50,[0m
419-
[1m[34m 51,[0m
423+
[1;34m 50,[0m
424+
[1;34m 51,[0m
420425
]"})))
421426
)
422427
}
@@ -430,8 +435,8 @@ mod tests {
430435
"
431436
Difference:
432437
[
433-
[1m[31m 1,[0m
434-
[1m[31m 2,[0m
438+
[1;31m 1,[0m
439+
[1;31m 2,[0m
435440
3,
436441
4,
437442
<---- 46 common lines omitted ---->
@@ -481,8 +486,8 @@ mod tests {
481486
err(displays_as(contains_substring(indoc!(
482487
r#"
483488
First line
484-
[1m[31mSecond line[0m
485-
[1m[34mSecond lines[0m
489+
[1;31mSecond line[0m
490+
[1;34mSecond lines[0m
486491
Third line
487492
"#
488493
))))

‎googletest/src/matchers/str_matcher.rs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -974,8 +974,8 @@ mod tests {
974974
err(displays_as(contains_substring(indoc!(
975975
"
976976
First line
977-
[1m[31mSecond line[0m
978-
[1m[34mSecond lines[0m
977+
[1;31mSecond line[0m
978+
[1;34mSecond lines[0m
979979
Third line
980980
"
981981
))))
@@ -1007,8 +1007,8 @@ mod tests {
10071007
err(displays_as(contains_substring(indoc!(
10081008
"
10091009
First line
1010-
[1m[31mSecond line[0m
1011-
[1m[34mSecond lines[0m
1010+
[1;31mSecond line[0m
1011+
[1;34mSecond lines[0m
10121012
Third line
10131013
<---- remaining lines omitted ---->
10141014
"
@@ -1040,8 +1040,8 @@ mod tests {
10401040
err(displays_as(contains_substring(indoc!(
10411041
"
10421042
First line
1043-
[1m[31mSecond line[0m
1044-
[1m[34mSecond lines[0m
1043+
[1;31mSecond line[0m
1044+
[1;34mSecond lines[0m
10451045
<---- remaining lines omitted ---->
10461046
"
10471047
))))
@@ -1075,8 +1075,8 @@ mod tests {
10751075
Difference:
10761076
<---- remaining lines omitted ---->
10771077
Second line
1078-
[1m[34mThird lines[0m
1079-
[1m[31mThird line[0m
1078+
[1;34mThird lines[0m
1079+
[1;31mThird line[0m
10801080
Fourth line
10811081
"
10821082
))))
@@ -1112,8 +1112,8 @@ mod tests {
11121112
Difference:
11131113
<---- remaining lines omitted ---->
11141114
Second line
1115-
[1m[34mThird lines[0m
1116-
[1m[31mThird line[0m
1115+
[1;34mThird lines[0m
1116+
[1;31mThird line[0m
11171117
Fourth line
11181118
<---- remaining lines omitted ---->"
11191119
))))
@@ -1148,13 +1148,13 @@ mod tests {
11481148
"
11491149
Difference:
11501150
<---- remaining lines omitted ---->
1151-
[1m[34mline[0m
1152-
[1m[31mSecond line[0m
1151+
[1;34mline[0m
1152+
[1;31mSecond line[0m
11531153
Third line
1154-
[1m[34mFoorth line[0m
1155-
[1m[31mFourth line[0m
1156-
[1m[34mFifth[0m
1157-
[1m[31mFifth line[0m
1154+
[1;34mFoorth line[0m
1155+
[1;31mFourth line[0m
1156+
[1;34mFifth[0m
1157+
[1;31mFifth line[0m
11581158
<---- remaining lines omitted ---->
11591159
"
11601160
))))
@@ -1186,10 +1186,10 @@ mod tests {
11861186
err(displays_as(contains_substring(indoc!(
11871187
"
11881188
First line
1189-
[1m[31mSecond line[0m
1190-
[1m[34mSecond lines[0m
1189+
[1;31mSecond line[0m
1190+
[1;34mSecond lines[0m
11911191
Third line
1192-
[1m[31mFourth line[0m
1192+
[1;31mFourth line[0m
11931193
"
11941194
))))
11951195
)

0 commit comments

Comments
 (0)