snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-22 18:17:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix: Return a byte slice instead of a possibly wrong utf-8 str

Browse Source
This commit is contained in:
Kerollmops 2018-05-05 23:02:51 +02:00 committed by Clément Renault
parent 6d57a8af05
commit 0f9ada1c4e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib.rs
View File

@ -30,7 +30,7 @@ impl<'m, 'v, T: 'v, A> StreamBuilder<'m, 'v, T, A> {
} }
impl<'m, 'v, 'a, T: 'v + 'a, A: Automaton> fst::IntoStreamer<'a> for StreamBuilder<'m, 'v, T, A> { impl<'m, 'v, 'a, T: 'v + 'a, A: Automaton> fst::IntoStreamer<'a> for StreamBuilder<'m, 'v, T, A> {
type Item = (&'a str, &'a [T]); type Item = <Self::Into as fst::Streamer<'a>>::Item;
type Into = Stream<'m, 'v, T, A>; type Into = Stream<'m, 'v, T, A>;
fn into_stream(self) -> Self::Into { fn into_stream(self) -> Self::Into {
@ -47,13 +47,12 @@ pub struct Stream<'m, 'v, T: 'v, A: Automaton = fst::automaton::AlwaysMatch> {
} }
impl<'m, 'v, 'a, T: 'v + 'a, A: Automaton> fst::Streamer<'a> for Stream<'m, 'v, T, A> { impl<'m, 'v, 'a, T: 'v + 'a, A: Automaton> fst::Streamer<'a> for Stream<'m, 'v, T, A> {
type Item = (&'a str, &'a [T]); type Item = (&'a [u8], &'a [T]);
fn next(&'a mut self) -> Option<Self::Item> { fn next(&'a mut self) -> Option<Self::Item> {
// Here we can't just `map` because of some borrow rules // Here we can't just `map` because of some borrow rules
match self.inner.next() { match self.inner.next() {
Some((key, i)) => { Some((key, i)) => {
let key = unsafe { from_utf8_unchecked(key) };
let values = unsafe { self.values.get_unchecked(i as usize) }; let values = unsafe { self.values.get_unchecked(i as usize) };
Some((key, values)) Some((key, values))
}, },
@ -72,7 +71,7 @@ where
A: Automaton, A: Automaton,
A::State: Clone, A::State: Clone,
{ {
type Item = (&'a str, &'a [T], A::State); type Item = <Self::Into as fst::Streamer<'a>>::Item;
type Into = StreamWithState<'m, 'v, T, A>; type Into = StreamWithState<'m, 'v, T, A>;
fn into_stream(self) -> Self::Into { fn into_stream(self) -> Self::Into {
@ -93,12 +92,11 @@ where
A: Automaton, A: Automaton,
A::State: Clone, A::State: Clone,
{ {
type Item = (&'a str, &'a [T], A::State); type Item = (&'a [u8], &'a [T], A::State);
fn next(&'a mut self) -> Option<Self::Item> { fn next(&'a mut self) -> Option<Self::Item> {
match self.inner.next() { match self.inner.next() {
Some((k, i, state)) => { Some((key, i, state)) => {
let key = unsafe { from_utf8_unchecked(k) };
let values = unsafe { self.values.get_unchecked(i as usize) }; let values = unsafe { self.values.get_unchecked(i as usize) };
Some((key, values, state)) Some((key, values, state))
}, },