Detailed changes
@@ -7530,7 +7530,6 @@ name = "sqlez"
version = "0.1.0"
dependencies = [
"anyhow",
- "collections",
"futures 0.3.28",
"indoc",
"lazy_static",
@@ -8106,7 +8105,6 @@ version = "0.1.0"
dependencies = [
"alacritty_terminal",
"anyhow",
- "collections",
"db",
"dirs 4.0.0",
"futures 0.3.28",
@@ -8202,7 +8200,6 @@ name = "theme"
version = "0.1.0"
dependencies = [
"anyhow",
- "collections",
"color",
"derive_more",
"fs",
@@ -9346,7 +9343,6 @@ version = "0.1.0"
dependencies = [
"anyhow",
"backtrace",
- "collections",
"dirs 3.0.2",
"futures 0.3.28",
"git2",
@@ -5,13 +5,13 @@ use client::{
user::{User, UserStore},
Client, Subscription, TypedEnvelope, UserId,
};
-use collections::HashSet;
use futures::lock::Mutex;
use gpui::{
AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task, WeakModel,
};
use rand::prelude::*;
use std::{
+ collections::HashSet,
ops::{ControlFlow, Range},
sync::Arc,
};
@@ -10,7 +10,6 @@ use async_tungstenite::tungstenite::{
error::Error as WebsocketError,
http::{Request, StatusCode},
};
-use collections::HashMap;
use futures::{
channel::oneshot, future::LocalBoxFuture, AsyncReadExt, FutureExt, SinkExt, StreamExt,
TryFutureExt as _, TryStreamExt,
@@ -30,6 +29,7 @@ use serde_json;
use settings::{Settings, SettingsStore};
use std::{
any::TypeId,
+ collections::HashMap,
convert::TryFrom,
fmt::Write as _,
future::Future,
@@ -23,7 +23,7 @@ use crate::{
TextSystem, View, ViewContext, Window, WindowContext, WindowHandle, WindowId,
};
use anyhow::{anyhow, Result};
-use collections::{HashMap, HashSet, VecDeque};
+use collections::{FxHashMap, FxHashSet, VecDeque};
use futures::{channel::oneshot, future::LocalBoxFuture, Future};
use slotmap::SlotMap;
@@ -212,24 +212,24 @@ pub struct AppContext {
pending_updates: usize,
pub(crate) actions: Rc<ActionRegistry>,
pub(crate) active_drag: Option<AnyDrag>,
- pub(crate) next_frame_callbacks: HashMap<DisplayId, Vec<FrameCallback>>,
- pub(crate) frame_consumers: HashMap<DisplayId, Task<()>>,
+ pub(crate) next_frame_callbacks: FxHashMap<DisplayId, Vec<FrameCallback>>,
+ pub(crate) frame_consumers: FxHashMap<DisplayId, Task<()>>,
pub(crate) background_executor: BackgroundExecutor,
pub(crate) foreground_executor: ForegroundExecutor,
pub(crate) svg_renderer: SvgRenderer,
asset_source: Arc<dyn AssetSource>,
pub(crate) image_cache: ImageCache,
pub(crate) text_style_stack: Vec<TextStyleRefinement>,
- pub(crate) globals_by_type: HashMap<TypeId, Box<dyn Any>>,
+ pub(crate) globals_by_type: FxHashMap<TypeId, Box<dyn Any>>,
pub(crate) entities: EntityMap,
pub(crate) new_view_observers: SubscriberSet<TypeId, NewViewListener>,
pub(crate) windows: SlotMap<WindowId, Option<Window>>,
pub(crate) keymap: Rc<RefCell<Keymap>>,
pub(crate) global_action_listeners:
- HashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
+ FxHashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
pending_effects: VecDeque<Effect>,
- pub(crate) pending_notifications: HashSet<EntityId>,
- pub(crate) pending_global_notifications: HashSet<TypeId>,
+ pub(crate) pending_notifications: FxHashSet<EntityId>,
+ pub(crate) pending_global_notifications: FxHashSet<TypeId>,
pub(crate) observers: SubscriberSet<EntityId, Handler>,
// TypeId is the type of the event that the listener callback expects
pub(crate) event_listeners: SubscriberSet<EntityId, (TypeId, Listener)>,
@@ -274,23 +274,23 @@ impl AppContext {
flushing_effects: false,
pending_updates: 0,
active_drag: None,
- next_frame_callbacks: HashMap::default(),
- frame_consumers: HashMap::default(),
+ next_frame_callbacks: FxHashMap::default(),
+ frame_consumers: FxHashMap::default(),
background_executor: executor,
foreground_executor,
svg_renderer: SvgRenderer::new(asset_source.clone()),
asset_source,
image_cache: ImageCache::new(http_client),
text_style_stack: Vec::new(),
- globals_by_type: HashMap::default(),
+ globals_by_type: FxHashMap::default(),
entities,
new_view_observers: SubscriberSet::new(),
windows: SlotMap::with_key(),
keymap: Rc::new(RefCell::new(Keymap::default())),
- global_action_listeners: HashMap::default(),
+ global_action_listeners: FxHashMap::default(),
pending_effects: VecDeque::new(),
- pending_notifications: HashSet::default(),
- pending_global_notifications: HashSet::default(),
+ pending_notifications: FxHashSet::default(),
+ pending_global_notifications: FxHashSet::default(),
observers: SubscriberSet::new(),
event_listeners: SubscriberSet::new(),
release_listeners: SubscriberSet::new(),
@@ -53,7 +53,7 @@ use crate::{
Action, ActionRegistry, DispatchPhase, ElementContext, EntityId, FocusId, KeyBinding,
KeyContext, Keymap, KeymatchResult, Keystroke, KeystrokeMatcher, WindowContext,
};
-use collections::HashMap;
+use collections::FxHashMap;
use smallvec::{smallvec, SmallVec};
use std::{
any::{Any, TypeId},
@@ -69,9 +69,9 @@ pub(crate) struct DispatchTree {
node_stack: Vec<DispatchNodeId>,
pub(crate) context_stack: Vec<KeyContext>,
nodes: Vec<DispatchNode>,
- focusable_node_ids: HashMap<FocusId, DispatchNodeId>,
- view_node_ids: HashMap<EntityId, DispatchNodeId>,
- keystroke_matchers: HashMap<SmallVec<[KeyContext; 4]>, KeystrokeMatcher>,
+ focusable_node_ids: FxHashMap<FocusId, DispatchNodeId>,
+ view_node_ids: FxHashMap<EntityId, DispatchNodeId>,
+ keystroke_matchers: FxHashMap<SmallVec<[KeyContext; 4]>, KeystrokeMatcher>,
keymap: Rc<RefCell<Keymap>>,
action_registry: Rc<ActionRegistry>,
}
@@ -100,9 +100,9 @@ impl DispatchTree {
node_stack: Vec::new(),
context_stack: Vec::new(),
nodes: Vec::new(),
- focusable_node_ids: HashMap::default(),
- view_node_ids: HashMap::default(),
- keystroke_matchers: HashMap::default(),
+ focusable_node_ids: FxHashMap::default(),
+ view_node_ids: FxHashMap::default(),
+ keystroke_matchers: FxHashMap::default(),
keymap,
action_registry,
}
@@ -7,9 +7,12 @@ pub use context::*;
pub(crate) use matcher::*;
use crate::{Action, Keystroke, NoAction};
-use collections::{HashMap, HashSet};
+use collections::HashSet;
use smallvec::SmallVec;
-use std::any::{Any, TypeId};
+use std::{
+ any::{Any, TypeId},
+ collections::HashMap,
+};
/// An opaque identifier of which version of the keymap is currently active.
/// The keymap's version is changed whenever bindings are added or removed.
@@ -3,7 +3,7 @@ use crate::{
Point, Size,
};
use anyhow::Result;
-use collections::HashMap;
+use collections::FxHashMap;
use derive_more::{Deref, DerefMut};
use etagere::BucketedAtlasAllocator;
use metal::Device;
@@ -53,7 +53,7 @@ struct MetalAtlasState {
monochrome_textures: Vec<MetalAtlasTexture>,
polychrome_textures: Vec<MetalAtlasTexture>,
path_textures: Vec<MetalAtlasTexture>,
- tiles_by_key: HashMap<AtlasKey, AtlasTile>,
+ tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
}
impl PlatformAtlas for MetalAtlas {
@@ -2,7 +2,7 @@ use crate::{
point, AtlasTextureId, AtlasTile, Bounds, ContentMask, Corners, Edges, EntityId, Hsla, Pixels,
Point, ScaledPixels, StackingOrder,
};
-use collections::{BTreeMap, HashSet};
+use collections::{BTreeMap, FxHashSet};
use std::{fmt::Debug, iter::Peekable, slice};
// Exported to metal
@@ -159,7 +159,7 @@ impl Scene {
layer_id
}
- pub fn reuse_views(&mut self, views: &HashSet<EntityId>, prev_scene: &mut Self) {
+ pub fn reuse_views(&mut self, views: &FxHashSet<EntityId>, prev_scene: &mut Self) {
for shadow in prev_scene.shadows.drain(..) {
if views.contains(&shadow.view_id.into()) {
let order = &prev_scene.orders_by_layer[&shadow.layer_id];
@@ -2,7 +2,7 @@ use crate::{
AbsoluteLength, Bounds, DefiniteLength, Edges, Length, Pixels, Point, Size, Style,
WindowContext,
};
-use collections::{HashMap, HashSet};
+use collections::{FxHashMap, FxHashSet};
use smallvec::SmallVec;
use std::fmt::Debug;
use taffy::{
@@ -17,11 +17,11 @@ type NodeMeasureFn =
pub struct TaffyLayoutEngine {
taffy: Taffy,
- styles: HashMap<LayoutId, Style>,
- children_to_parents: HashMap<LayoutId, LayoutId>,
- absolute_layout_bounds: HashMap<LayoutId, Bounds<Pixels>>,
- computed_layouts: HashSet<LayoutId>,
- nodes_to_measure: HashMap<LayoutId, NodeMeasureFn>,
+ styles: FxHashMap<LayoutId, Style>,
+ children_to_parents: FxHashMap<LayoutId, LayoutId>,
+ absolute_layout_bounds: FxHashMap<LayoutId, Bounds<Pixels>>,
+ computed_layouts: FxHashSet<LayoutId>,
+ nodes_to_measure: FxHashMap<LayoutId, NodeMeasureFn>,
}
static EXPECT_MESSAGE: &str = "we should avoid taffy layout errors by construction if possible";
@@ -30,11 +30,11 @@ impl TaffyLayoutEngine {
pub fn new() -> Self {
TaffyLayoutEngine {
taffy: Taffy::new(),
- styles: HashMap::default(),
- children_to_parents: HashMap::default(),
- absolute_layout_bounds: HashMap::default(),
- computed_layouts: HashSet::default(),
- nodes_to_measure: HashMap::default(),
+ styles: FxHashMap::default(),
+ children_to_parents: FxHashMap::default(),
+ absolute_layout_bounds: FxHashMap::default(),
+ computed_layouts: FxHashSet::default(),
+ nodes_to_measure: FxHashMap::default(),
}
}
@@ -13,7 +13,7 @@ use crate::{
SharedString, Size, UnderlineStyle,
};
use anyhow::anyhow;
-use collections::{BTreeSet, HashMap, HashSet};
+use collections::{BTreeSet, FxHashMap, FxHashSet};
use core::fmt;
use derive_more::Deref;
use itertools::Itertools;
@@ -42,10 +42,10 @@ pub(crate) const SUBPIXEL_VARIANTS: u8 = 4;
/// The GPUI text rendering sub system.
pub struct TextSystem {
platform_text_system: Arc<dyn PlatformTextSystem>,
- font_ids_by_font: RwLock<HashMap<Font, Result<FontId>>>,
- font_metrics: RwLock<HashMap<FontId, FontMetrics>>,
- raster_bounds: RwLock<HashMap<RenderGlyphParams, Bounds<DevicePixels>>>,
- wrapper_pool: Mutex<HashMap<FontIdWithSize, Vec<LineWrapper>>>,
+ font_ids_by_font: RwLock<FxHashMap<Font, Result<FontId>>>,
+ font_metrics: RwLock<FxHashMap<FontId, FontMetrics>>,
+ raster_bounds: RwLock<FxHashMap<RenderGlyphParams, Bounds<DevicePixels>>>,
+ wrapper_pool: Mutex<FxHashMap<FontIdWithSize, Vec<LineWrapper>>>,
font_runs_pool: Mutex<Vec<Vec<FontRun>>>,
fallback_font_stack: SmallVec<[Font; 2]>,
}
@@ -447,7 +447,7 @@ impl WindowTextSystem {
Ok(lines)
}
- pub(crate) fn finish_frame(&self, reused_views: &HashSet<EntityId>) {
+ pub(crate) fn finish_frame(&self, reused_views: &FxHashSet<EntityId>) {
self.line_layout_cache.finish_frame(reused_views)
}
@@ -1,5 +1,5 @@
use crate::{px, EntityId, FontId, GlyphId, Pixels, PlatformTextSystem, Point, Size};
-use collections::{HashMap, HashSet};
+use collections::{FxHashMap, FxHashSet};
use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
use smallvec::SmallVec;
use std::{
@@ -277,10 +277,10 @@ impl WrappedLineLayout {
pub(crate) struct LineLayoutCache {
view_stack: Mutex<Vec<EntityId>>,
- previous_frame: Mutex<HashMap<CacheKey, Arc<LineLayout>>>,
- current_frame: RwLock<HashMap<CacheKey, Arc<LineLayout>>>,
- previous_frame_wrapped: Mutex<HashMap<CacheKey, Arc<WrappedLineLayout>>>,
- current_frame_wrapped: RwLock<HashMap<CacheKey, Arc<WrappedLineLayout>>>,
+ previous_frame: Mutex<FxHashMap<CacheKey, Arc<LineLayout>>>,
+ current_frame: RwLock<FxHashMap<CacheKey, Arc<LineLayout>>>,
+ previous_frame_wrapped: Mutex<FxHashMap<CacheKey, Arc<WrappedLineLayout>>>,
+ current_frame_wrapped: RwLock<FxHashMap<CacheKey, Arc<WrappedLineLayout>>>,
platform_text_system: Arc<dyn PlatformTextSystem>,
}
@@ -296,7 +296,7 @@ impl LineLayoutCache {
}
}
- pub fn finish_frame(&self, reused_views: &HashSet<EntityId>) {
+ pub fn finish_frame(&self, reused_views: &FxHashSet<EntityId>) {
debug_assert_eq!(self.view_stack.lock().len(), 0);
let mut prev_frame = self.previous_frame.lock();
@@ -10,7 +10,7 @@ use crate::{
WindowOptions, WindowTextSystem,
};
use anyhow::{anyhow, Context as _, Result};
-use collections::HashSet;
+use collections::FxHashSet;
use derive_more::{Deref, DerefMut};
use futures::{
channel::{mpsc, oneshot},
@@ -259,7 +259,7 @@ pub struct Window {
pub(crate) element_id_stack: GlobalElementId,
pub(crate) rendered_frame: Frame,
pub(crate) next_frame: Frame,
- pub(crate) dirty_views: HashSet<EntityId>,
+ pub(crate) dirty_views: FxHashSet<EntityId>,
pub(crate) focus_handles: Arc<RwLock<SlotMap<FocusId, AtomicUsize>>>,
focus_listeners: SubscriberSet<(), AnyWindowFocusListener>,
focus_lost_listeners: SubscriberSet<(), AnyObserver>,
@@ -428,7 +428,7 @@ impl Window {
element_id_stack: GlobalElementId::default(),
rendered_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
next_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
- dirty_views: HashSet::default(),
+ dirty_views: FxHashSet::default(),
focus_handles: Arc::new(RwLock::new(SlotMap::with_key())),
focus_listeners: SubscriberSet::new(),
focus_lost_listeners: SubscriberSet::new(),
@@ -21,7 +21,7 @@ use std::{
};
use anyhow::Result;
-use collections::{HashMap, HashSet};
+use collections::{FxHashMap, FxHashSet};
use derive_more::{Deref, DerefMut};
use media::core_video::CVImageBuffer;
use smallvec::SmallVec;
@@ -53,8 +53,8 @@ pub(crate) struct TooltipRequest {
pub(crate) struct Frame {
pub(crate) focus: Option<FocusId>,
pub(crate) window_active: bool,
- pub(crate) element_states: HashMap<GlobalElementId, ElementStateBox>,
- pub(crate) mouse_listeners: HashMap<TypeId, Vec<(StackingOrder, EntityId, AnyMouseListener)>>,
+ pub(crate) element_states: FxHashMap<GlobalElementId, ElementStateBox>,
+ pub(crate) mouse_listeners: FxHashMap<TypeId, Vec<(StackingOrder, EntityId, AnyMouseListener)>>,
pub(crate) dispatch_tree: DispatchTree,
pub(crate) scene: Scene,
pub(crate) depth_map: Vec<(StackingOrder, EntityId, Bounds<Pixels>)>,
@@ -65,13 +65,13 @@ pub(crate) struct Frame {
pub(crate) element_offset_stack: Vec<Point<Pixels>>,
pub(crate) requested_input_handler: Option<RequestedInputHandler>,
pub(crate) tooltip_request: Option<TooltipRequest>,
- pub(crate) cursor_styles: HashMap<EntityId, CursorStyle>,
+ pub(crate) cursor_styles: FxHashMap<EntityId, CursorStyle>,
pub(crate) requested_cursor_style: Option<CursorStyle>,
pub(crate) view_stack: Vec<EntityId>,
- pub(crate) reused_views: HashSet<EntityId>,
+ pub(crate) reused_views: FxHashSet<EntityId>,
#[cfg(any(test, feature = "test-support"))]
- pub(crate) debug_bounds: collections::HashMap<String, Bounds<Pixels>>,
+ pub(crate) debug_bounds: collections::FxHashMap<String, Bounds<Pixels>>,
}
impl Frame {
@@ -79,8 +79,8 @@ impl Frame {
Frame {
focus: None,
window_active: false,
- element_states: HashMap::default(),
- mouse_listeners: HashMap::default(),
+ element_states: FxHashMap::default(),
+ mouse_listeners: FxHashMap::default(),
dispatch_tree,
scene: Scene::default(),
depth_map: Vec::new(),
@@ -91,13 +91,13 @@ impl Frame {
element_offset_stack: Vec::new(),
requested_input_handler: None,
tooltip_request: None,
- cursor_styles: HashMap::default(),
+ cursor_styles: FxHashMap::default(),
requested_cursor_style: None,
view_stack: Vec::new(),
- reused_views: HashSet::default(),
+ reused_views: FxHashSet::default(),
#[cfg(any(test, feature = "test-support"))]
- debug_bounds: HashMap::default(),
+ debug_bounds: FxHashMap::default(),
}
}
@@ -8,7 +8,6 @@ use editor::{actions::Cancel, scroll::Autoscroll, Editor};
use file_associations::FileAssociations;
use anyhow::{anyhow, Result};
-use collections::{hash_map, HashMap};
use gpui::{
actions, div, overlay, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
ClipboardItem, DismissEvent, Div, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
@@ -23,7 +22,14 @@ use project::{
};
use project_panel_settings::{ProjectPanelDockPosition, ProjectPanelSettings};
use serde::{Deserialize, Serialize};
-use std::{cmp::Ordering, ffi::OsStr, ops::Range, path::Path, sync::Arc};
+use std::{
+ cmp::Ordering,
+ collections::{hash_map, HashMap},
+ ffi::OsStr,
+ ops::Range,
+ path::Path,
+ sync::Arc,
+};
use theme::ThemeSettings;
use ui::{prelude::*, v_flex, ContextMenu, Icon, KeyBinding, Label, ListItem};
use unicase::UniCase;
@@ -1693,13 +1699,15 @@ impl ClipboardEntry {
#[cfg(test)]
mod tests {
use super::*;
- use collections::HashSet;
use gpui::{TestAppContext, View, VisualTestContext, WindowHandle};
use pretty_assertions::assert_eq;
use project::{project_settings::ProjectSettings, FakeFs};
use serde_json::json;
use settings::SettingsStore;
- use std::path::{Path, PathBuf};
+ use std::{
+ collections::HashSet,
+ path::{Path, PathBuf},
+ };
use workspace::AppState;
#[gpui::test]
@@ -3501,7 +3509,7 @@ mod tests {
cx: &mut VisualTestContext,
) -> Vec<String> {
let mut result = Vec::new();
- let mut project_entries = HashSet::default();
+ let mut project_entries = HashSet::new();
let mut has_editor = false;
panel.update(cx, |panel, cx| {
@@ -25,11 +25,11 @@ use project::{
};
use semantic_index::{SemanticIndex, SemanticIndexStatus};
-use collections::HashSet;
use settings::Settings;
use smol::stream::StreamExt;
use std::{
any::{Any, TypeId},
+ collections::HashSet,
mem,
ops::{Not, Range},
path::PathBuf,
@@ -955,7 +955,7 @@ impl ProjectSearchView {
semantic_state: None,
semantic_permissioned: None,
search_options: options,
- panels_with_errors: HashSet::default(),
+ panels_with_errors: HashSet::new(),
active_match_index: None,
query_editor_was_focused: false,
included_files_editor,
@@ -3,7 +3,6 @@ use ai::{
models::TruncationDirection,
};
use anyhow::{anyhow, Result};
-use collections::HashSet;
use language::{Grammar, Language};
use rusqlite::{
types::{FromSql, FromSqlResult, ToSqlOutput, ValueRef},
@@ -13,6 +12,7 @@ use sha1::{Digest, Sha1};
use std::{
borrow::Cow,
cmp::{self, Reverse},
+ collections::HashSet,
ops::Range,
path::Path,
sync::Arc,
@@ -267,7 +267,7 @@ impl CodeContextRetriever {
let mut spans = Vec::new();
let mut collapsed_ranges_within = Vec::new();
- let mut parsed_name_ranges = HashSet::default();
+ let mut parsed_name_ranges = HashSet::new();
for (i, context_match) in matches.iter().enumerate() {
// Items which are collapsible but not embeddable have no item range
let item_range = if let Some(item_range) = context_match.item_range.clone() {
@@ -7,7 +7,6 @@ license = "GPL-3.0-or-later"
[dependencies]
anyhow.workspace = true
-collections.workspace = true
futures.workspace = true
indoc.workspace = true
lazy_static.workspace = true
@@ -1,9 +1,8 @@
use anyhow::Context;
-use collections::HashMap;
use futures::{channel::oneshot, Future, FutureExt};
use lazy_static::lazy_static;
use parking_lot::{Mutex, RwLock};
-use std::{marker::PhantomData, ops::Deref, sync::Arc, thread};
+use std::{collections::HashMap, marker::PhantomData, ops::Deref, sync::Arc, thread};
use thread_local::ThreadLocal;
use crate::{connection::Connection, domain::Migrator, util::UnboundedSyncSender};
@@ -13,7 +13,6 @@ doctest = false
[dependencies]
alacritty_terminal = "0.22.0"
anyhow.workspace = true
-collections.workspace = true
db.workspace = true
dirs = "4.0.0"
futures.workspace = true
@@ -30,7 +30,6 @@ use mappings::mouse::{
scroll_report,
};
-use collections::{HashMap, VecDeque};
use procinfo::LocalProcessInfo;
use serde::{Deserialize, Serialize};
use settings::Settings;
@@ -40,6 +39,7 @@ use util::truncate_and_trailoff;
use std::{
cmp::{self, min},
+ collections::{HashMap, VecDeque},
fmt::Display,
ops::{Deref, Index, RangeInclusive},
os::unix::prelude::AsRawFd,
@@ -1,4 +1,3 @@
-use collections::HashMap;
use gpui::{px, AbsoluteLength, AppContext, FontFeatures, Pixels};
use schemars::{
gen::SchemaGenerator,
@@ -8,7 +7,7 @@ use schemars::{
use serde_derive::{Deserialize, Serialize};
use serde_json::Value;
use settings::SettingsJsonSchemaParams;
-use std::path::PathBuf;
+use std::{collections::HashMap, path::PathBuf};
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
@@ -8,7 +8,11 @@ license = "GPL-3.0-or-later"
[features]
default = []
stories = ["dep:itertools", "dep:story"]
-test-support = ["gpui/test-support", "fs/test-support", "settings/test-support"]
+test-support = [
+ "gpui/test-support",
+ "fs/test-support",
+ "settings/test-support"
+]
[lib]
path = "src/theme.rs"
@@ -16,7 +20,6 @@ doctest = false
[dependencies]
anyhow.workspace = true
-collections.workspace = true
color.workspace = true
derive_more.workspace = true
fs.workspace = true
@@ -1,8 +1,8 @@
+use std::collections::HashMap;
use std::path::Path;
use std::sync::Arc;
use anyhow::{anyhow, Context, Result};
-use collections::HashMap;
use derive_more::{Deref, DerefMut};
use fs::Fs;
use futures::StreamExt;
@@ -64,7 +64,7 @@ impl ThemeRegistry {
pub fn new(assets: Box<dyn AssetSource>) -> Self {
let registry = Self {
state: RwLock::new(ThemeRegistryState {
- themes: HashMap::default(),
+ themes: HashMap::new(),
}),
assets,
};
@@ -15,7 +15,6 @@ test-support = ["tempfile", "git2"]
[dependencies]
anyhow.workspace = true
backtrace = "0.3"
-collections.workspace = true
dirs = "3.0"
futures.workspace = true
git2 = { workspace = true, optional = true }
@@ -1,5 +1,4 @@
-use collections::HashMap;
-use std::{cmp::Ordering, ops::Range};
+use std::{cmp::Ordering, collections::HashMap, ops::Range};
/// Construct a string and a list of offsets within that string using a single
/// string containing embedded position markers.
@@ -1,7 +1,6 @@
use anyhow::{anyhow, Context, Result};
use cli::{ipc, IpcHandshake};
use cli::{ipc::IpcSender, CliRequest, CliResponse};
-use collections::HashMap;
use editor::scroll::Autoscroll;
use editor::Editor;
use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
@@ -11,6 +10,7 @@ use gpui::{AppContext, AsyncAppContext, Global};
use itertools::Itertools;
use language::{Bias, Point};
use release_channel::parse_zed_link;
+use std::collections::HashMap;
use std::ffi::OsStr;
use std::os::unix::prelude::OsStrExt;
use std::path::Path;
@@ -176,7 +176,7 @@ pub async fn handle_cli_connection(
if let Some(request) = requests.next().await {
match request {
CliRequest::Open { paths, wait } => {
- let mut caret_positions = HashMap::default();
+ let mut caret_positions = HashMap::new();
let paths = if paths.is_empty() {
workspace::last_opened_workspace_paths()
@@ -733,7 +733,6 @@ fn open_settings_file(
mod tests {
use super::*;
use assets::Assets;
- use collections::HashSet;
use editor::{scroll::Autoscroll, DisplayPoint, Editor};
use gpui::{
actions, Action, AnyWindowHandle, AppContext, AssetSource, Entity, TestAppContext,
@@ -743,7 +742,10 @@ mod tests {
use project::{project_settings::ProjectSettings, Project, ProjectPath};
use serde_json::json;
use settings::{handle_settings_file_changes, watch_config_file, SettingsStore};
- use std::path::{Path, PathBuf};
+ use std::{
+ collections::HashSet,
+ path::{Path, PathBuf},
+ };
use theme::{ThemeRegistry, ThemeSettings};
use workspace::{
item::{Item, ItemHandle},