mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 10:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Switch CreateWorktreeResponse::worktree_id to be a i32

Browse source 
Apparently all IDs in `sqlx` on the server are represented as i32s.
This commit is contained in:
Antonio Scandurra 2021-06-11 16:15:06 +02:00
parent 20542f54ef
commit 4efebdaa52
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zed-rpc/src/rest.rs
View file

@ -2,6 +2,6 @@ use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct CreateWorktreeResponse { pub struct CreateWorktreeResponse {
pub worktree_id: u64, pub worktree_id: i32,
pub rpc_address: String, pub rpc_address: String,
} }

4
zed/src/lib.rs
View file

@ -34,7 +34,7 @@ pub fn init(cx: &mut MutableAppContext) {
fn share_worktree(_: &(), cx: &mut MutableAppContext) { fn share_worktree(_: &(), cx: &mut MutableAppContext) {
let zed_url = std::env::var("ZED_SERVER_URL").unwrap_or("https://zed.dev".to_string()); let zed_url = std::env::var("ZED_SERVER_URL").unwrap_or("https://zed.dev".to_string());
cx.spawn::<_, _, surf::Result<()>>(|cx| async move { cx.spawn::<_, _, surf::Result<()>>(|cx| async move {
let (user_id, access_token) = login(zed_url.clone(), cx).await?; let (user_id, access_token) = login(zed_url.clone(), &cx).await?;
let mut response = surf::post(format!("{}/api/worktrees", &zed_url)) let mut response = surf::post(format!("{}/api/worktrees", &zed_url))
.header( .header(
@ -70,7 +70,7 @@ fn share_worktree(_: &(), cx: &mut MutableAppContext) {
.detach(); .detach();
} }
fn login(zed_url: String, cx: AsyncAppContext) -> Task<Result<(String, String)>> { fn login(zed_url: String, cx: &AsyncAppContext) -> Task<Result<(String, String)>> {
let platform = cx.platform(); let platform = cx.platform();
cx.background_executor().spawn(async move { cx.background_executor().spawn(async move {
if let Some((user_id, access_token)) = platform.read_credentials(&zed_url) { if let Some((user_id, access_token)) = platform.read_credentials(&zed_url) {