rebase on main

This commit is contained in:
Tamo 2021-09-08 17:11:29 +02:00
parent 2988d3c76d
commit 4b618b95e4
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
2 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@ use heed::EnvOpenOptions;
use itertools::Itertools;
use maplit::hashset;
use milli::update::{Settings, UpdateBuilder, UpdateFormat};
use milli::{AscDesc, Criterion, Index, Search, SearchResult};
use milli::{AscDesc, Criterion, Index, Member, Search, SearchResult};
use rand::Rng;
use Criterion::*;

View File

@ -1,6 +1,6 @@
use big_s::S;
use milli::Criterion::{Attribute, Exactness, Proximity, Typo, Words};
use milli::{AscDesc, Error, Search, UserError};
use milli::{AscDesc, Error, Member, Search, UserError};
use crate::search::{self, EXTERNAL_DOCUMENTS_IDS};
@ -16,7 +16,7 @@ fn sort_ranking_rule_missing() {
search.limit(EXTERNAL_DOCUMENTS_IDS.len());
search.authorize_typos(true);
search.optional_words(true);
search.sort_criteria(vec![AscDesc::Asc(S("tag"))]);
search.sort_criteria(vec![AscDesc::Asc(Member::Field(S("tag")))]);
let result = search.execute();
assert!(matches!(result, Err(Error::UserError(UserError::SortRankingRuleMissing))));