fix import namespace

some import
d1y · Oct 23, 2024 · 93b52a0 · 93b52a0
1 parent 3a3e6ac
commit 93b52a0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/crates/assistant/src/inline_assistant.rs b/crates/assistant/src/inline_assistant.rs
@@ -56,7 +56,7 @@ use text::{OffsetRangeExt, ToPoint as _};
 use theme::ThemeSettings;
 use ui::{prelude::*, CheckboxWithLabel, IconButtonShape, Popover, Tooltip};
 use util::{RangeExt, ResultExt};
-use workspace::{notifications::NotificationId, ItemHandle, Toast, Workspace};
+use workspace::{notifications::NotificationId, item::ItemHandle, Toast, Workspace};
 
 pub fn init(
     fs: Arc<dyn Fs>,

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
@@ -166,7 +166,7 @@ use workspace::notifications::{DetachAndPromptErr, NotificationId, NotifyTaskExt
 use workspace::{
     searchable::SearchEvent, ItemNavHistory, SplitDirection, ViewId, Workspace, WorkspaceId,
 };
-use workspace::{Item as WorkspaceItem, OpenInTerminal, OpenTerminal, TabBarSettings, Toast};
+use workspace::{item::Item as WorkspaceItem, OpenInTerminal, OpenTerminal, TabBarSettings, Toast};
 
 use crate::hover_links::find_url;
 use crate::signature_help::{SignatureHelpHiddenBy, SignatureHelpState};

diff --git a/crates/editor/src/proposed_changes_editor.rs b/crates/editor/src/proposed_changes_editor.rs
@@ -10,7 +10,7 @@ use std::{any::TypeId, ops::Range, rc::Rc, time::Duration};
 use text::ToOffset;
 use ui::prelude::*;
 use workspace::{
-    searchable::SearchableItemHandle, Item, ItemHandle as _, ToolbarItemEvent, ToolbarItemLocation,
+    searchable::SearchableItemHandle, item::Item, item::ItemHandle, ToolbarItemEvent, ToolbarItemLocation,
     ToolbarItemView, Workspace,
 };
 
@@ -350,7 +350,7 @@ impl EventEmitter<ToolbarItemEvent> for ProposedChangesEditorToolbar {}
 impl ToolbarItemView for ProposedChangesEditorToolbar {
     fn set_active_pane_item(
         &mut self,
-        active_pane_item: Option<&dyn workspace::ItemHandle>,
+        active_pane_item: Option<&dyn ItemHandle>,
         _cx: &mut ViewContext<Self>,
     ) -> workspace::ToolbarItemLocation {
         self.current_editor =

diff --git a/crates/image_viewer/src/image_viewer.rs b/crates/image_viewer/src/image_viewer.rs
@@ -12,8 +12,8 @@ use project::{Project, ProjectEntryId, ProjectPath};
 use settings::Settings;
 use std::{ffi::OsStr, path::PathBuf};
 use workspace::{
-    item::{Item, ProjectItem, SerializableItem, TabContentParams},
-    ItemId, ItemSettings, Pane, Workspace, WorkspaceId,
+    item::{Item, ProjectItem, SerializableItem, TabContentParams, ItemSettings},
+    ItemId, Pane, Workspace, WorkspaceId,
 };
 
 const IMAGE_VIEWER_KIND: &str = "ImageView";

diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
@@ -45,14 +45,14 @@ use theme::SyntaxTheme;
 use util::{debug_panic, RangeExt, ResultExt, TryFutureExt};
 use workspace::{
     dock::{DockPosition, Panel, PanelEvent},
-    item::ItemHandle,
+    item::{ItemHandle, WeakItemHandle},
     searchable::{SearchEvent, SearchableItem},
     ui::{
         h_flex, v_flex, ActiveTheme, ButtonCommon, Clickable, Color, ContextMenu, FluentBuilder,
         HighlightedLabel, Icon, IconButton, IconButtonShape, IconName, IconSize, Label,
         LabelCommon, ListItem, Selectable, Spacing, StyledExt, StyledTypography, Tooltip,
     },
-    OpenInTerminal, WeakItemHandle, Workspace,
+    OpenInTerminal, Workspace,
 };
 use worktree::{Entry, ProjectEntryId, WorktreeId};