don't use 'svob' as name

Author: mmoskal

controllers/aici_abi/src/cfg.rs

@@ -1,8 +1,8 @@
 use crate::host::host_trie;
 use crate::lex::{Lexer, LexerState, StateID, VobIdx, VobSet};
 use crate::{
-    svob::SimpleVob,
     toktrie::{Recognizer, SpecialToken},
+    SimpleVob,
 };
 use anyhow::Result;
 use cfgrammar::{

controllers/aici_abi/src/dlex.rs

@@ -1,7 +1,7 @@
 use crate::{
     recognizer::{FunctionalRecognizer, StackRecognizer},
-    svob::SimpleVob,
     toktrie::SpecialToken,
+    SimpleVob,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]

controllers/aici_abi/src/host.rs

@@ -1,4 +1,4 @@
-use crate::{bytes::vec_from_bytes, svob::SimpleVob, toktrie::TokTrie, SeqId, TokenId};
+use crate::{bytes::vec_from_bytes, toktrie::TokTrie, SeqId, SimpleVob, TokenId};
 use serde::{Deserialize, Serialize};
 
 #[repr(transparent)]

controllers/aici_abi/src/lib.rs

@@ -1,9 +1,8 @@
-pub use toktrie::{bytes, recognizer, rng, svob};
-
 pub use toktrie;
+pub use toktrie::SimpleVob;
+pub use toktrie::{bytes, recognizer, rng};
 
 use serde::{Deserialize, Serialize};
-use svob::SimpleVob;
 
 mod host;
 

controllers/declctrl/src/declctrl.rs

@@ -10,7 +10,7 @@
 */
 
 use aici_abi::{
-    aici_expose_all, bytes::limit_str, cfg::CfgParser, host_trie, rx::{RecRx, RxStackRecognizer}, svob::SimpleVob, tokenize_bytes, toktrie::{Recognizer, SpecialToken, TokTrie}, AiciCtrl, Branch, InitPromptArg, InitPromptResult, MidProcessArg, MidProcessResult, TokenId, VariableStorage
+    aici_expose_all, bytes::limit_str, cfg::CfgParser, host_trie, rx::{RecRx, RxStackRecognizer}, SimpleVob, tokenize_bytes, toktrie::{Recognizer, SpecialToken, TokTrie}, AiciCtrl, Branch, InitPromptArg, InitPromptResult, MidProcessArg, MidProcessResult, TokenId, VariableStorage
 };
 use core::panic;
 use serde::{Deserialize, Serialize};

controllers/jsctrl/src/jsctrl.rs

@@ -3,7 +3,7 @@ use std::sync::Mutex;
 use aici_abi::{
     aici_stop, host_trie,
     recognizer::{AnythingGoes, StackRecognizer},
-    svob::SimpleVob,
+    SimpleVob,
     toktrie::{Recognizer, SpecialToken, TokTrie},
     AiciCtrl, InitPromptArg, InitPromptResult, MidProcessArg, MidProcessResult, TokenId,
     VariableStorage,

controllers/llguidance_ctrl/src/earley/lexer.rs

@@ -1,4 +1,4 @@
-use aici_abi::svob::SimpleVob;
+use aici_abi::SimpleVob;
 use anyhow::Result;
 use std::fmt::Debug;
 

controllers/llguidance_ctrl/src/earley/lexerspec.rs

@@ -1,4 +1,4 @@
-use aici_abi::{bytes::limit_str, svob::SimpleVob};
+use aici_abi::{bytes::limit_str, SimpleVob};
 use anyhow::Result;
 use derivre::{ExprRef, RegexAst, RegexBuilder};
 use std::{fmt::Debug, hash::Hash};

controllers/llguidance_ctrl/src/earley/parser.rs

@@ -8,9 +8,8 @@ use std::{
 };
 
 use aici_abi::{
-    svob::SimpleVob,
     toktrie::{Recognizer, SpecialToken, TokTrie},
-    TokenId,
+    SimpleVob, TokenId,
 };
 use anyhow::{bail, ensure, Result};
 use serde::{Deserialize, Serialize};

controllers/llguidance_ctrl/src/earley/regexvec.rs

@@ -1,4 +1,4 @@
-use aici_abi::svob::SimpleVob;
+use aici_abi::SimpleVob;
 use derivre::raw::{DerivCache, ExprSet, NextByteCache, VecHashCons};
 use std::fmt::Debug;