diff --git a/Cargo.lock b/Cargo.lock index ea108192ce..51116fa5ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,7 +87,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f" dependencies = [ "base64 0.22.0", - "bitflags 2.4.2", + "bitflags 2.6.0", "home", "libc", "log", @@ -110,7 +110,7 @@ version = "0.24.1-dev" source = "git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f#cacdb5bb3b72bad2c729227537979d95af75978f" dependencies = [ "base64 0.22.0", - "bitflags 2.4.2", + "bitflags 2.6.0", "home", "libc", "log", @@ -1583,7 +1583,16 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec", + "bit-vec 0.6.3", +] + +[[package]] +name = "bit-set" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +dependencies = [ + "bit-vec 0.7.0", ] [[package]] @@ -1592,6 +1601,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bit-vec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" + [[package]] name = "bit_field" version = "0.10.2" @@ -1606,9 +1621,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -1634,11 +1649,11 @@ dependencies = [ [[package]] name = "blade-graphics" version = "0.4.0" -source = "git+https://github.com/kvark/blade?rev=21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7#21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7" +source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818" dependencies = [ "ash", "ash-window", - "bitflags 2.4.2", + "bitflags 2.6.0", "block", "bytemuck", "codespan-reporting", @@ -1664,7 +1679,7 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.2.1" -source = "git+https://github.com/kvark/blade?rev=21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7#21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7" +source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818" dependencies = [ "proc-macro2", "quote", @@ -1674,7 +1689,7 @@ dependencies = [ [[package]] name = "blade-util" version = "0.1.0" -source = "git+https://github.com/kvark/blade?rev=21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7#21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7" +source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818" dependencies = [ "blade-graphics", "bytemuck", @@ -1922,7 +1937,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "log", "polling 3.3.2", "rustix 0.38.32", @@ -2859,7 +2874,7 @@ name = "cosmic-text" version = "0.11.2" source = "git+https://github.com/pop-os/cosmic-text?rev=542b20c#542b20ca4376a3b5de5fa629db1a4ace44e18e0c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "fontdb", "log", "rangemap", @@ -4013,7 +4028,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" dependencies = [ - "bit-set", + "bit-set 0.5.3", "regex", ] @@ -4070,7 +4085,7 @@ name = "feedback" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.6.0", "client", "db", "editor", @@ -4404,7 +4419,7 @@ dependencies = [ name = "fsevent" version = "0.1.0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "core-foundation", "fsevent-sys 3.1.0", "parking_lot", @@ -4715,7 +4730,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -4826,7 +4841,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -4847,7 +4862,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", ] [[package]] @@ -5104,7 +5119,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f7acb9683d7c7068aa46d47557bfa4e35a277964b350d9504a87b03610163fd" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "heed-traits", "heed-types", @@ -6667,17 +6682,17 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "naga" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" +version = "0.20.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=425526828f738c95ec50b016c6a761bc00d2fb25#425526828f738c95ec50b016c6a761bc00d2fb25" dependencies = [ - "bit-set", - "bitflags 2.4.2", + "arrayvec", + "bit-set 0.6.0", + "bitflags 2.6.0", + "cfg_aliases", "codespan-reporting", "hexf-parse", "indexmap 2.2.6", "log", - "num-traits", "rustc-hash", "spirv", "termcolor", @@ -6773,7 +6788,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "libc", "memoffset", @@ -6785,7 +6800,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -6854,7 +6869,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys 4.1.0", @@ -7067,6 +7082,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "nvim-rs" version = "0.6.0-pre" @@ -7216,7 +7240,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -8230,7 +8254,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "memchr", "unicase", ] @@ -9043,7 +9067,7 @@ version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno 0.3.8", "itoa", "libc", @@ -9118,7 +9142,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "bytemuck", "libm", "smallvec", @@ -9341,7 +9365,7 @@ version = "0.1.0" dependencies = [ "any_vec", "anyhow", - "bitflags 2.4.2", + "bitflags 2.6.0", "client", "collections", "editor", @@ -9769,13 +9793,13 @@ dependencies = [ [[package]] name = "simplelog" -version = "0.9.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc0ffd69814a9b251d43afcabf96dad1b29f5028378056257be9e3fecc9f720" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ - "chrono", "log", "termcolor", + "time", ] [[package]] @@ -9928,12 +9952,11 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits", + "bitflags 2.6.0", ] [[package]] @@ -10109,7 +10132,7 @@ dependencies = [ "atoi", "base64 0.21.7", "bigdecimal", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "bytes 1.5.0", "chrono", @@ -10156,7 +10179,7 @@ dependencies = [ "atoi", "base64 0.21.7", "bigdecimal", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "chrono", "crc", @@ -10578,7 +10601,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aef1f9d4c1dbdd1cb3a63be9efd2f04d8ddbc919d46112982c76818ffc2f1a7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cap-fs-ext", "cap-std", "fd-lock", @@ -10719,9 +10742,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -10882,18 +10905,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -10944,7 +10967,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "libc", "num-conv", + "num_threads", "powerfmt", "serde", "time-core", @@ -11303,7 +11328,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "bytes 1.5.0", "futures-core", "futures-util", @@ -12074,7 +12099,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cursor-icon", "log", "serde", @@ -12226,7 +12251,7 @@ version = "0.201.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "indexmap 2.2.6", "semver", ] @@ -12493,7 +12518,7 @@ checksum = "371d828b6849ea06d598ae7dd1c316e8dd9e99b76f77d93d5886cb25c7f8e188" dependencies = [ "anyhow", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "bytes 1.5.0", "cap-fs-ext", "cap-net-ext", @@ -12580,7 +12605,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "rustix 0.38.32", "wayland-backend", "wayland-scanner", @@ -12603,7 +12628,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -12615,7 +12640,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -12734,7 +12759,7 @@ checksum = "ae1136a209614ace00b0c11f04dc7cf42540773be3b22eff6ad165110aba29c1" dependencies = [ "anyhow", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "thiserror", "tracing", "wasmtime", @@ -13164,7 +13189,7 @@ version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "windows-sys 0.52.0", ] @@ -13183,7 +13208,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "288f992ea30e6b5c531b52cdd5f3be81c148554b09ea416f058d16556ba92c27" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "wit-bindgen-rt", "wit-bindgen-rust-macro", ] @@ -13239,7 +13264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.6.0", "indexmap 2.2.6", "log", "serde", @@ -13445,7 +13470,7 @@ name = "xim-parser" version = "0.2.1" source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index aa665f6897..3667418ac8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -284,10 +284,10 @@ async-trait = "0.1" async-watch = "0.3.1" async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] } base64 = "0.13" -bitflags = "2.4.2" -blade-graphics = { git = "https://github.com/kvark/blade", rev = "21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7" } -blade-macros = { git = "https://github.com/kvark/blade", rev = "21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7" } -blade-util = { git = "https://github.com/kvark/blade", rev = "21a56f780e21e4cb42c70a1dcf4b59842d1ad7f7" } +bitflags = "2.6.0" +blade-graphics = { git = "https://github.com/zed-industries/blade", rev = "a477c2008db27db0b9f745715e119b3ee7ab7818" } +blade-macros = { git = "https://github.com/zed-industries/blade", rev = "a477c2008db27db0b9f745715e119b3ee7ab7818" } +blade-util = { git = "https://github.com/zed-industries/blade", rev = "a477c2008db27db0b9f745715e119b3ee7ab7818" } cap-std = "3.0" cargo_toml = "0.20" chrono = { version = "0.4", features = ["serde"] } @@ -365,6 +365,7 @@ shellexpand = "2.1.0" shlex = "1.3.0" signal-hook = "0.3.17" similar = "1.3" +simplelog = "0.12.2" smallvec = { version = "1.6", features = ["union"] } smol = "1.2" strum = { version = "0.25.0", features = ["derive"] } diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml index f7463693eb..e23c63453e 100644 --- a/crates/live_kit_client/Cargo.toml +++ b/crates/live_kit_client/Cargo.toml @@ -57,7 +57,7 @@ gpui = { workspace = true, features = ["test-support"] } live_kit_server.workspace = true nanoid.workspace = true sha2.workspace = true -simplelog = "0.9" +simplelog.workspace = true [build-dependencies] serde.workspace = true diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml index 3c42fe9e35..1c58b2f082 100644 --- a/crates/storybook/Cargo.toml +++ b/crates/storybook/Cargo.toml @@ -29,7 +29,7 @@ picker.workspace = true project.workspace = true rust-embed.workspace = true settings.workspace = true -simplelog = "0.9" +simplelog.workspace = true story.workspace = true strum = { version = "0.25.0", features = ["derive"] } theme.workspace = true diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml index 997e27929a..5d8b0b8c0f 100644 --- a/crates/theme_importer/Cargo.toml +++ b/crates/theme_importer/Cargo.toml @@ -20,7 +20,7 @@ schemars = { workspace = true, features = ["indexmap"] } serde.workspace = true serde_json.workspace = true serde_json_lenient.workspace = true -simplelog = "0.9" +simplelog.workspace= true strum = { version = "0.25.0", features = ["derive"] } theme.workspace = true vscode_theme = "0.2.0" diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs index 661ac079ae..53a8c9643d 100644 --- a/crates/theme_importer/src/main.rs +++ b/crates/theme_importer/src/main.rs @@ -12,6 +12,7 @@ use indexmap::IndexMap; use log::LevelFilter; use schemars::schema_for; use serde::Deserialize; +use simplelog::ColorChoice; use simplelog::{TermLogger, TerminalMode}; use theme::{Appearance, AppearanceContent, ThemeFamilyContent}; @@ -94,11 +95,6 @@ fn main() -> Result<()> { let log_config = { let mut config = simplelog::ConfigBuilder::new(); - config - .set_level_color(log::Level::Trace, simplelog::Color::Cyan) - .set_level_color(log::Level::Info, simplelog::Color::Blue) - .set_level_color(log::Level::Warn, simplelog::Color::Yellow) - .set_level_color(log::Level::Error, simplelog::Color::Red); if !args.warn_on_missing { config.add_filter_ignore_str("theme_printer"); @@ -107,8 +103,13 @@ fn main() -> Result<()> { config.build() }; - TermLogger::init(LevelFilter::Trace, log_config, TerminalMode::Mixed) - .expect("could not initialize logger"); + TermLogger::init( + LevelFilter::Trace, + log_config, + TerminalMode::Mixed, + ColorChoice::Auto, + ) + .expect("could not initialize logger"); if let Some(command) = args.command { match command { diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index d1c6a186c8..221b819d97 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -85,7 +85,7 @@ search.workspace = true serde.workspace = true serde_json.workspace = true settings.workspace = true -simplelog = "0.9" +simplelog.workspace = true smol.workspace = true snippet_provider.workspace = true tab_switcher.workspace = true diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 5ee1997845..46f20179a3 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -80,7 +80,9 @@ fn fail_to_open_window_async(e: anyhow::Error, cx: &mut AsyncAppContext) { } fn fail_to_open_window(e: anyhow::Error, _cx: &mut AppContext) { - eprintln!("Zed failed to open a window: {e:?}"); + eprintln!( + "Zed failed to open a window: {e:?}. See https://zed.dev/docs/linux for troubleshooting steps." + ); #[cfg(not(target_os = "linux"))] { process::exit(1); @@ -99,7 +101,12 @@ fn fail_to_open_window(e: anyhow::Error, _cx: &mut AppContext) { .add_notification( notification_id, Notification::new("Zed failed to launch") - .body(Some(format!("{e:?}").as_str())) + .body(Some( + format!( + "{e:?}. See https://zed.dev/docs/linux for troubleshooting steps." + ) + .as_str(), + )) .priority(Priority::High) .icon(ashpd::desktop::Icon::with_names(&[ "dialog-question-symbolic", @@ -708,8 +715,8 @@ fn init_logger() { Ok(log_file) => { let mut config_builder = ConfigBuilder::new(); - config_builder.set_time_format_str("%Y-%m-%dT%T%:z"); - config_builder.set_time_to_local(true); + config_builder.set_time_format_rfc3339(); + config_builder.set_time_offset_to_local().log_err(); #[cfg(target_os = "linux")] {