mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-24 17:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Rebased to main

Browse source
This commit is contained in:
Mikayla Maki 2022-11-18 17:06:33 -08:00
parent a0cb6542ba
commit 992b94eef3
8 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/integration_tests.rs
View file

@ -1,6 +1,6 @@
use crate::{
db::{NewUserParams, ProjectId, TestDb, UserId},
rpc::{Executor, Server, Store},
db::{NewUserParams, ProjectId, SqliteTestDb as TestDb, UserId},
rpc::{Executor, Server},
AppState,
};

2
crates/collab/src/main.rs
View file

@ -9,11 +9,11 @@ mod db_tests;
#[cfg(test)]
mod integration_tests;
use crate::db::{Db, PostgresDb};
use crate::rpc::ResultExt as _;
use anyhow::anyhow;
use axum::{routing::get, Router};
use collab::{Error, Result};
use db::DefaultDb as Db;
use serde::Deserialize;
use std::{
env::args,

4
crates/editor/src/items.rs
View file

@ -1,7 +1,7 @@
use crate::{
display_map::ToDisplayPoint, link_go_to_definition::hide_link_definition,
movement::surrounding_word, Anchor, Autoscroll, Editor, EditorMode, Event, ExcerptId,
MultiBuffer, MultiBufferSnapshot, NavigationData, ToPoint as _, FORMAT_TIMEOUT,
movement::surrounding_word, Anchor, Autoscroll, Editor, Event, ExcerptId, MultiBuffer,
MultiBufferSnapshot, NavigationData, ToPoint as _, FORMAT_TIMEOUT,
};
use anyhow::{anyhow, Context, Result};
use futures::FutureExt;

2
crates/editor/src/persistence.rs
View file

@ -24,7 +24,7 @@ impl Domain for Editor {
}
impl EditorDb {
fn get_path(_item_id: ItemId, _workspace_id: WorktreeId) -> PathBuf {
fn _get_path(_item_id: ItemId, _workspace_id: WorktreeId) -> PathBuf {
unimplemented!();
}
}

2
crates/sqlez/src/migrations.rs
View file

@ -58,7 +58,7 @@ impl Connection {
mod test {
use indoc::indoc;
use crate::{connection::Connection, thread_safe_connection::ThreadSafeConnection};
use crate::connection::Connection;
#[test]
fn test_migrations_are_added_to_table() {

2
crates/terminal/src/terminal.rs
View file

@ -34,9 +34,7 @@ use mappings::mouse::{
use procinfo::LocalProcessInfo;
use settings::{AlternateScroll, Settings, Shell, TerminalBlink};
use terminal_container_view::TerminalContainer;
use util::ResultExt;
use workspace::register_deserializable_item;
use std::{
cmp::min,

4
crates/workspace/src/persistence/model.rs
View file

@ -16,9 +16,7 @@ use sqlez::{
};
use util::ResultExt;
use crate::{
dock::DockPosition, item::ItemHandle, ItemDeserializers, Member, Pane, PaneAxis, Workspace,
};
use crate::{dock::DockPosition, ItemDeserializers, Member, Pane, PaneAxis, Workspace};
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct WorkspaceId(Arc<Vec<PathBuf>>);

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

@ -677,7 +677,7 @@ impl Workspace {
cx: &mut MutableAppContext,
) -> Task<(
ViewHandle<Workspace>,
Vec<Option<Result<Box<dyn ItemHandle>, Arc<anyhow::Error>>>>,
Vec<Option<Result<Box<dyn ItemHandle>, anyhow::Error>>>,
)> {
let project_handle = Project::local(
app_state.client.clone(),
@ -740,7 +740,7 @@ impl Workspace {
Some(
workspace
.update(&mut cx, |workspace, cx| {
workspace.open_path(project_path, true, cx)
workspace.open_path(project_path, None, true, cx)
})
.await,
)