Commit b43f04f

committed

fix: Make SIMD newline count match non-SIMD

1 parent 2e6d0ac commit b43f04fCopy full SHA for b43f04f

File tree

2 files changed

-34

lines changed

src/renderer
- mod.rs
tests
- formatter.rs

2 files changed

-34

lines changed

`‎src/renderer/mod.rs`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3009,9 +3009,7 @@ fn max_line_number(groups: &[Group<'_>]) -> usize {`
`3009`	`3009`	`fn newline_count(body: &str) -> usize {`
`3010`	`3010`	`#[cfg(feature = "simd")]`
`3011`	`3011`	`{`
`3012`		`- memchr::memchr_iter(b'\n', body.as_bytes())`
`3013`		`- .count()`
`3014`		`- .saturating_sub(1)`
	`3012`	`+ memchr::memchr_iter(b'\n', body.as_bytes()).count()`
`3015`	`3013`	`}`
`3016`	`3014`	`#[cfg(not(feature = "simd"))]`
`3017`	`3015`	`{`
`@@ -3058,9 +3056,6 @@ mod test {`
`3058`	`3056`	`bar = { base = '^^not-valid^^', path = 'bar' }`
`3059`	`3057`	`"#;`
`3060`	`3058`	`let actual_count = newline_count(source);`
`3061`		`- #[cfg(feature = "simd")]`
`3062`		`- let expected_count = 9;`
`3063`		`- #[cfg(not(feature = "simd"))]`
`3064`	`3059`	`let expected_count = 10;`
`3065`	`3060`
`3066`	`3061`	`assert_eq!(expected_count, actual_count);`

`‎tests/formatter.rs`

Lines changed: 0 additions & 28 deletions

Original file line number	Diff line number	Diff line change
`@@ -3253,33 +3253,6 @@ fn multiple_line_num_widths() {`
`3253`	`3253`	`),`
`3254`	`3254`	`];`
`3255`	`3255`
`3256`		`- #[cfg(feature = "simd")]`
`3257`		`- {`
`3258`		`- let expected_ascii = str![[r#"`
`3259`		-error: invalid character `^` in path base name: `^^not-valid^^`, the first character must be a Unicode XID start character (most letters or `_`)
`3260`		`- --> Cargo.toml:10:24`
`3261`		`- \|`
`3262`		`-9 \| [dependencies]`
`3263`		`-10\| bar = { base = '^^not-valid^^', path = 'bar' }`
`3264`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`3265`		`-"#]];`
`3266`		`- let renderer = Renderer::plain();`
`3267`		`- assert_data_eq!(renderer.render(input), expected_ascii);`
`3268`		`-`
`3269`		`- let expected_unicode = str![[r#"`
`3270`		-error: invalid character `^` in path base name: `^^not-valid^^`, the first character must be a Unicode XID start character (most letters or `_`)
`3271`		`- ╭▸ Cargo.toml:10:24`
`3272`		`- │`
`3273`		`-9 │ [dependencies]`
`3274`		`-10│ bar = { base = '^^not-valid^^', path = 'bar' }`
`3275`		`- ╰╴ ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━`
`3276`		`-"#]];`
`3277`		`- let renderer = renderer.decor_style(DecorStyle::Unicode);`
`3278`		`- assert_data_eq!(renderer.render(input), expected_unicode);`
`3279`		`- }`
`3280`		`-`
`3281`		`- #[cfg(not(feature = "simd"))]`
`3282`		`- {`
`3283`	`3256`	`let expected_ascii = str![[r#"`
`3284`	`3257`	error: invalid character `^` in path base name: `^^not-valid^^`, the first character must be a Unicode XID start character (most letters or `_`)
`3285`	`3258`	`--> Cargo.toml:10:24`
@@ -3301,5 +3274,4 @@ error: invalid character `^` in path base name: `^^not-valid^^`, the first chara
`3301`	`3274`	`"#]];`
`3302`	`3275`	`let renderer = renderer.decor_style(DecorStyle::Unicode);`
`3303`	`3276`	`assert_data_eq!(renderer.render(input), expected_unicode);`
`3304`		`- }`
`3305`	`3277`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit b43f04f

File tree

2 files changed

2 files changed

`‎src/renderer/mod.rs`

`‎tests/formatter.rs`

0 commit comments