gpui: Don't export named Context
from prelude (#21869)
This PR updates the `gpui::prelude` to not export the `Context` trait named. This prevents some naming clashes in downstream consumers. Release Notes: - N/A
This commit is contained in:
parent
b3ffbea376
commit
937186da12
11 changed files with 12 additions and 31 deletions
|
@ -92,11 +92,7 @@ use task::SpawnInTerminal;
|
|||
use theme::{ActiveTheme, SystemAppearance, ThemeSettings};
|
||||
pub use toolbar::{Toolbar, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
|
||||
pub use ui;
|
||||
use ui::{
|
||||
div, h_flex, px, BorrowAppContext, Context as _, Div, FluentBuilder, InteractiveElement as _,
|
||||
IntoElement, ParentElement as _, Pixels, SharedString, Styled as _, ViewContext,
|
||||
VisualContext as _, WindowContext,
|
||||
};
|
||||
use ui::prelude::*;
|
||||
use util::{paths::SanitizedPath, ResultExt, TryFutureExt};
|
||||
use uuid::Uuid;
|
||||
pub use workspace_settings::{
|
||||
|
@ -597,7 +593,6 @@ impl AppState {
|
|||
use node_runtime::NodeRuntime;
|
||||
use session::Session;
|
||||
use settings::SettingsStore;
|
||||
use ui::Context as _;
|
||||
|
||||
if !cx.has_global::<SettingsStore>() {
|
||||
let settings_store = SettingsStore::test(cx);
|
||||
|
@ -7856,7 +7851,7 @@ mod tests {
|
|||
}
|
||||
|
||||
mod register_project_item_tests {
|
||||
use ui::Context as _;
|
||||
use gpui::Context as _;
|
||||
|
||||
use super::*;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue