Skip to content

Commit df2557a

Browse files
committed
refactor(rust): consolidate EventEmitter imports to use crate::events
Remove the intermediate events module re-exports and update all imports to directly reference crate::events::EventEmitter instead of using relative paths like super::events::EventEmitter. This change simplifies the module structure by eliminating the unnecessary events submodule in the client directory and ensures consistent import paths across all client modules.
1 parent 071c5fd commit df2557a

7 files changed

Lines changed: 7 additions & 15 deletions

File tree

rust/src/client/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ use crate::retrieval::PipelineRetriever;
5555
use crate::storage::Workspace;
5656

5757
use super::engine::Engine;
58-
use super::events::EventEmitter;
58+
use crate::events::EventEmitter;
5959

6060
/// Builder for creating a [`Engine`] client.
6161
///

rust/src/client/engine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use crate::retrieval::{PipelineRetriever, RetrieveEventReceiver};
5151
use crate::storage::{PersistedDocument, Workspace};
5252
use crate::{DocumentTree, Error};
5353

54-
use super::events::EventEmitter;
54+
use crate::events::EventEmitter;
5555
use super::index_context::{IndexContext, IndexSource};
5656
use super::indexer::IndexerClient;
5757
use super::query_context::{QueryContext, QueryScope};

rust/src/client/events.rs

Lines changed: 0 additions & 7 deletions
This file was deleted.

rust/src/client/indexer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::index::{
3434
use crate::llm::LlmClient;
3535
use crate::storage::{DocumentMeta, PersistedDocument};
3636

37-
use super::events::{EventEmitter, IndexEvent};
37+
use crate::events::{EventEmitter, IndexEvent};
3838
use super::index_context::IndexSource;
3939
use super::types::{IndexOptions, IndexedDocument};
4040

rust/src/client/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
6868
mod builder;
6969
mod engine;
70-
pub mod events;
7170
mod index_context;
7271
mod indexer;
7372
mod query_context;
@@ -90,10 +89,10 @@ pub use index_context::IndexContext;
9089
pub use query_context::QueryContext;
9190

9291
// ============================================================
93-
// Events
92+
// Events (re-export from crate::events)
9493
// ============================================================
9594

96-
pub use events::EventEmitter;
95+
pub use crate::events::EventEmitter;
9796

9897
// ============================================================
9998
// Result & Info Types

rust/src/client/retriever.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use std::sync::Arc;
2121

2222
use tracing::info;
2323

24-
use super::events::{EventEmitter, QueryEvent};
24+
use crate::events::{EventEmitter, QueryEvent};
2525
use super::types::QueryResultItem;
2626
use crate::config::Config;
2727
use crate::document::{DocumentTree, ReasoningIndex};

rust/src/client/workspace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use tracing::{debug, info};
3030
use crate::error::Result;
3131
use crate::storage::{PersistedDocument, Workspace};
3232

33-
use super::events::{EventEmitter, WorkspaceEvent};
33+
use crate::events::{EventEmitter, WorkspaceEvent};
3434
use super::types::DocumentInfo;
3535

3636
/// Workspace management client.

0 commit comments

Comments
 (0)