Tweak from_utf8_lossy to return a new MaybeOwned enum #12098
Conversation
|
@huonw I tried out the |
| @@ -495,7 +495,7 @@ pub struct Display<'a, P> { | |||
|
|
|||
| impl<'a, P: GenericPath> fmt::Show for Display<'a, P> { | |||
| fn fmt(d: &Display<P>, f: &mut fmt::Formatter) -> fmt::Result { | |||
| d.with_str(|s| f.pad(s)) | |||
| fmt::Show::fmt(&d.as_maybe_owned().as_slice(), f) | |||
There was a problem hiding this comment.
This will need to be rebased, the formatters are now methods.
There was a problem hiding this comment.
I take it you're referring to #12066, which hasn't landed yet. Guess I'll have to wait for that.
There was a problem hiding this comment.
Oh, whoops... forgot that small detail. ;)
(It's on the bots now, fwiw.)
|
@huonw I've pushed my changes. Everything but rebasing for |
|
@huonw Rebased on top of the fmt changes |
| None => return Slice(unsafe { cast::transmute(v) }), | ||
| Some(i) => i | ||
| }; | ||
|
|
||
| static REPLACEMENT: &'static [u8] = bytes!(0xEF, 0xBF, 0xBD); // U+FFFD in UTF-8 | ||
| let mut i = 0u; |
There was a problem hiding this comment.
Oh geeze. Of course we should. That's a nice bit of performance I was throwing away.
|
Fixed |
| unsafe { raw::push_bytes(&mut res, v.slice_to(firstbad)) }; | ||
| } | ||
|
|
||
| let mut lastgood = firstbad; |
There was a problem hiding this comment.
I'd like a comment about why having lastgood pointing a known bad byte is ok. (To check my understanding: the while loop below will always trigger on the first run, so on the first pass lastgood == i_ and nothing is copied.)
MaybeOwned allows from_utf8_lossy to avoid allocation if there are no invalid bytes in the input.
Declare a `type SendStr = MaybeOwned<'static>` to ease readibility of types that needed the old SendStr behavior. Implement all the traits for MaybeOwned that SendStr used to implement.
|
Renamed |
MaybeOwned allows from_utf8_lossy to avoid allocation if there are no invalid bytes in the input. Before: ``` test str::bench::from_utf8_lossy_100_ascii ... bench: 183 ns/iter (+/- 5) test str::bench::from_utf8_lossy_100_invalid ... bench: 341 ns/iter (+/- 15) test str::bench::from_utf8_lossy_100_multibyte ... bench: 227 ns/iter (+/- 13) test str::bench::from_utf8_lossy_invalid ... bench: 102 ns/iter (+/- 4) test str::bench::is_utf8_100_ascii ... bench: 2 ns/iter (+/- 0) test str::bench::is_utf8_100_multibyte ... bench: 2 ns/iter (+/- 0) ``` Now: ``` test str::bench::from_utf8_lossy_100_ascii ... bench: 96 ns/iter (+/- 4) test str::bench::from_utf8_lossy_100_invalid ... bench: 318 ns/iter (+/- 10) test str::bench::from_utf8_lossy_100_multibyte ... bench: 105 ns/iter (+/- 2) test str::bench::from_utf8_lossy_invalid ... bench: 105 ns/iter (+/- 2) test str::bench::is_utf8_100_ascii ... bench: 2 ns/iter (+/- 0) test str::bench::is_utf8_100_multibyte ... bench: 2 ns/iter (+/- 0) ```
…r=jonas-schievink fix: show `macro_rules` snippet in blocks fixes rust-lang/rust-analyzer#12092
MaybeOwned allows from_utf8_lossy to avoid allocation if there are no
invalid bytes in the input.
Before:
Now: