fix compilation errors (unnecessary path segments) (#1277)

server/bleep/src/background.rs

@@ -89,7 +89,7 @@ impl BackgroundExecutor {
                 let tokio_ref = tokio_ref.clone();
                 let thread_priority = thread_priority::ThreadPriority::Max;
 
-                std::thread::Builder::new()
+                thread::Builder::new()
                     .name("index-worker".to_owned())
                     .spawn_with_priority(thread_priority, move |_| {
                         let _tokio = tokio_ref.enter();

server/bleep/src/cache.rs

@@ -548,7 +548,7 @@ impl<'a> ChunkCache<'a> {
         let branches_hash = blake3::hash(payload.branches.join("\n").as_ref()).to_string();
 
         match self.cache.entry(id) {
-            scc::hash_map::Entry::Occupied(mut existing) => {
+            Entry::Occupied(mut existing) => {
                 let key = existing.key();
                 trace!(?key, "found; not upserting new");
                 if existing.get().value != branches_hash {
@@ -560,7 +560,7 @@ impl<'a> ChunkCache<'a> {
                 }
                 *existing.get_mut() = branches_hash.into();
             }
-            scc::hash_map::Entry::Vacant(vacant) => {
+            Entry::Vacant(vacant) => {
                 let key = vacant.key();
                 trace!(?key, "inserting new");
                 self.new_sql

server/bleep/src/commits.rs

@@ -437,7 +437,7 @@ Assistant: initialisation"#,
 
 pub async fn generate_tutorial_questions(
     db: crate::db::SqlDb,
-    llm_gateway: Result<crate::llm::client::Client>,
+    llm_gateway: Result<llm::client::Client>,
     repo_pool: RepositoryPool,
     reporef: RepoRef,
 ) -> Result<()> {

server/bleep/src/indexes.rs

@@ -118,11 +118,11 @@ impl Indexes {
         // we don't support old schemas, and tantivy will hard
         // error if we try to open a db with a different schema.
         if config.index_path("repo").as_ref().exists() {
-            std::fs::remove_dir_all(config.index_path("repo"))?;
+            fs::remove_dir_all(config.index_path("repo"))?;
             debug!("removed index repo dir")
         }
         if config.index_path("content").as_ref().exists() {
-            std::fs::remove_dir_all(config.index_path("content"))?;
+            fs::remove_dir_all(config.index_path("content"))?;
             debug!("removed index content dir")
         }
         Ok(())

server/bleep/src/indexes/schema.rs

@@ -69,7 +69,7 @@ pub struct File {
 
 impl File {
     pub fn new() -> Self {
-        let mut builder = tantivy::schema::SchemaBuilder::new();
+        let mut builder = SchemaBuilder::new();
         let trigram = TextOptions::default().set_stored().set_indexing_options(
             TextFieldIndexing::default()
                 .set_tokenizer("default")

server/bleep/src/query/parser.rs

@@ -356,7 +356,7 @@ impl<'a> Literal<'a> {
 
     /// Force this literal into the `Regex` variant.
     fn make_regex(&mut self) {
-        *self = match std::mem::take(self) {
+        *self = match mem::take(self) {
             Self::Plain(s) | Self::Regex(s) => Self::Regex(s),
         }
     }

server/bleep/src/repo.rs

@@ -153,7 +153,7 @@ impl FromStr for RepoRef {
 }
 
 impl Display for RepoRef {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.backend() {
             Backend::Github => write!(f, "github.com/{}", self.name()),
             Backend::Local => write!(f, "local/{}", self.name()),

server/bleep/src/webserver.rs

@@ -254,7 +254,7 @@ impl Error {
         self
     }
 
-    fn internal<S: std::fmt::Display>(message: S) -> Self {
+    fn internal<S: fmt::Display>(message: S) -> Self {
         Error {
             status: StatusCode::INTERNAL_SERVER_ERROR,
             body: EndpointError {
@@ -264,7 +264,7 @@ impl Error {
         }
     }
 
-    fn user<S: std::fmt::Display>(message: S) -> Self {
+    fn user<S: fmt::Display>(message: S) -> Self {
         Error {
             status: StatusCode::BAD_REQUEST,
             body: EndpointError {
@@ -274,7 +274,7 @@ impl Error {
         }
     }
 
-    fn not_found<S: std::fmt::Display>(message: S) -> Self {
+    fn not_found<S: fmt::Display>(message: S) -> Self {
         Error {
             status: StatusCode::NOT_FOUND,
             body: EndpointError {

server/bleep/src/webserver/query.rs

@@ -16,5 +16,5 @@ pub(super) async fn handle(
         .query(&app)
         .await
         .map(json)
-        .map_err(super::Error::from)
+        .map_err(Error::from)
 }

server/bleep/src/webserver/repos.rs

@@ -168,7 +168,7 @@ impl Repo {
             last_update: origin.pushed_at.unwrap(),
             last_index: None,
             most_common_lang: None,
-            branch_filter: crate::repo::BranchFilterConfig::Select(vec![]),
+            branch_filter: BranchFilterConfig::Select(vec![]),
             file_filter: Default::default(),
             branches: vec![],
         }

server/bleep/src/webserver/search.rs

@@ -20,7 +20,7 @@ pub(super) async fn semantic_code(
         Ok(q) => semantic::execute::execute(semantic, q, args)
             .await
             .map(json)
-            .map_err(super::Error::from),
+            .map_err(Error::from),
         Err(err) => {
             error!(?err, "Couldn't parse query");
             Err(Error::new(ErrorKind::UpstreamService, "error"))

server/bleep/src/webserver/studio.rs

@@ -991,7 +991,7 @@ pub async fn diff(
     let response = llm_gateway.chat(&messages, None).await?;
     let diff_chunks = diff::extract(&response)?.collect::<Vec<_>>();
 
-    let valid_chunks = futures::stream::iter(diff_chunks)
+    let valid_chunks = stream::iter(diff_chunks)
         .map(|mut chunk| {
             let app = (*app).clone();
             let llm_context = llm_context.clone();
@@ -1331,7 +1331,7 @@ pub async fn diff_apply(
 
     // Force a re-sync.
     for repo in dirty_repos {
-        let _ = crate::webserver::repos::sync(
+        let _ = webserver::repos::sync(
             Query(webserver::repos::RepoParams {
                 repo,
                 shallow: false,

server/bleep/src/webserver/template.rs

@@ -18,7 +18,7 @@ pub async fn create(
 ) -> webserver::Result<String> {
     let user_id = user
         .username()
-        .ok_or_else(|| super::Error::user("didn't have user ID"))?
+        .ok_or_else(|| Error::user("didn't have user ID"))?
         .to_string();
 
     let id = sqlx::query!(
@@ -49,7 +49,7 @@ pub async fn list(
 ) -> webserver::Result<Json<Vec<Template>>> {
     let user_id = user
         .username()
-        .ok_or_else(|| super::Error::user("didn't have user ID"))?
+        .ok_or_else(|| Error::user("didn't have user ID"))?
         .to_string();
 
     let templates = sqlx::query_as!(
@@ -72,7 +72,7 @@ pub async fn get(
 ) -> webserver::Result<Json<Template>> {
     let user_id = user
         .username()
-        .ok_or_else(|| super::Error::user("didn't have user ID"))?
+        .ok_or_else(|| Error::user("didn't have user ID"))?
         .to_string();
 
     let template = sqlx::query_as!(
@@ -104,7 +104,7 @@ pub async fn patch(
 ) -> webserver::Result<String> {
     let user_id = user
         .username()
-        .ok_or_else(|| super::Error::user("didn't have user ID"))?
+        .ok_or_else(|| Error::user("didn't have user ID"))?
         .to_string();
 
     let mut transaction = app.sql.begin().await?;
@@ -167,7 +167,7 @@ pub async fn delete(
 ) -> webserver::Result<()> {
     let user_id = user
         .username()
-        .ok_or_else(|| super::Error::user("didn't have user ID"))?
+        .ok_or_else(|| Error::user("didn't have user ID"))?
         .to_string();
 
     sqlx::query!(