Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove 2 suffix for collab, rope, settings, menu

Browse source 
Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Max Brunsfeld 2024-01-03 12:28:45 -08:00
parent 177e3028a9
commit 0cf65223ce
234 changed files with 3765 additions and 42229 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/journal/Cargo.toml
View file

@ -13,8 +13,7 @@ editor = { path = "../editor" }
gpui = { package = "gpui2", path = "../gpui2" }
util = { path = "../util" }
workspace = { path = "../workspace" }
settings2 = { path = "../settings2" }
settings = { path = "../settings" }
anyhow.workspace = true
chrono = "0.4"
dirs = "4.0"

4
crates/journal/src/journal.rs
View file

@ -3,7 +3,7 @@ use chrono::{Datelike, Local, NaiveTime, Timelike};
use gpui::{actions, AppContext, ViewContext};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings2::Settings;
use settings::Settings;
use std::{
fs::OpenOptions,
path::{Path, PathBuf},
@ -36,7 +36,7 @@ pub enum HourFormat {
Hour24,
}
impl settings2::Settings for JournalSettings {
impl settings::Settings for JournalSettings {
const KEY: Option<&'static str> = Some("journal");
type FileContent = Self;