zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-06 10:57:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Mikayla 2024-01-29 08:29:19 -08:00
parent ff76b2ec4d
commit 29c56b60ca
No known key found for this signature in database
9 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -97,6 +97,7 @@ chrono = { version = "0.4", features = ["serde"] }
ctor = "0.2.6"
derive_more = { version = "0.99.17" }
env_logger = { version = "0.9" }
simplelog = { git = "https://github.com/zed-industries/simplelog.rs", default-features = false, features = ["local-offset"] }
futures = { version = "0.3" }
globset = { version = "0.4" }
indoc = "1"

3
crates/gpui/Cargo.toml
View File

@ -59,6 +59,7 @@ slotmap = "1.0.6"
schemars.workspace = true
bitflags = "2.4.0"
anyhow.workspace = true
wgpu = { version = "0.19", optional = true }
[dev-dependencies]
backtrace = "0.3"
@ -66,7 +67,7 @@ collections = { path = "../collections", features = ["test-support"] }
dhat = "0.3"
env_logger.workspace = true
png = "0.16"
simplelog = "0.9"
simplelog.workspace = true
util = { path = "../util", features = ["test-support"] }
[build-dependencies]

11
crates/gpui/src/platform/mac.rs
View File

@ -4,8 +4,15 @@ mod dispatcher;
mod display;
mod display_linker;
mod events;
mod metal_atlas;
mod metal_renderer;
// #[cfg(not(feature = "wgpu"))]
// mod metal_atlas;
// #[cfg(not(feature = "wgpu"))]
// mod metal_renderer;
mod wgpu_atlas;
mod wgpu_renderer;
mod open_type;
mod platform;
mod text_system;

1
crates/gpui/src/platform/mac/wgpu_atlas.rs Normal file
View File

@ -0,0 +1 @@

0
crates/gpui/src/platform/mac/wgpu_renderer.rs Normal file
View File

2
crates/live_kit_client/Cargo.toml
View File

@ -62,7 +62,7 @@ parking_lot.workspace = true
serde.workspace = true
serde_derive.workspace = true
sha2 = "0.10"
simplelog = "0.9"
simplelog.workspace = true
[build-dependencies]
serde.workspace = true

3
crates/storybook/Cargo.toml
View File

@ -29,7 +29,8 @@ log.workspace = true
rust-embed.workspace = true
serde.workspace = true
settings = { path = "../settings" }
simplelog = "0.9"
env_logger.workspace = true
simplelog.workspace = true
smallvec.workspace = true
story = { path = "../story" }
theme = { path = "../theme" }

2
crates/theme_importer/Cargo.toml
View File

@ -21,7 +21,7 @@ pathfinder_color = "0.5"
rust-embed.workspace = true
serde.workspace = true
serde_json.workspace = true
simplelog = "0.9"
simplelog.workspace = true
strum = { version = "0.25.0", features = ["derive"] }
theme = { path = "../theme" }
uuid.workspace = true

2
crates/zed/Cargo.toml
View File

@ -105,7 +105,7 @@ serde.workspace = true
serde_derive.workspace = true
serde_json.workspace = true
schemars.workspace = true
simplelog = "0.9"
simplelog.workspace = true
smallvec.workspace = true
smol.workspace = true
tempfile.workspace = true