terminal: Bump sysinfo crate (#39681)
Release Notes: - N/A *or* Added/Fixed/Improved ... Co-authored-by: dino <dinojoaocosta@gmail.com>
This commit is contained in:
@@ -331,7 +331,7 @@ impl RemoteClient {
|
||||
let ssh_connection = cx
|
||||
.update(|cx| {
|
||||
cx.update_default_global(|pool: &mut ConnectionPool, cx| {
|
||||
pool.connect(connection_options.clone(), &delegate, cx)
|
||||
pool.connect(connection_options.clone(), delegate.clone(), cx)
|
||||
})
|
||||
})?
|
||||
.await
|
||||
@@ -561,7 +561,7 @@ impl RemoteClient {
|
||||
let (ssh_connection, io_task) = match async {
|
||||
let ssh_connection = cx
|
||||
.update_global(|pool: &mut ConnectionPool, cx| {
|
||||
pool.connect(connection_options, &delegate, cx)
|
||||
pool.connect(connection_options, delegate.clone(), cx)
|
||||
})?
|
||||
.await
|
||||
.map_err(|error| error.cloned())?;
|
||||
@@ -987,7 +987,7 @@ impl ConnectionPool {
|
||||
pub fn connect(
|
||||
&mut self,
|
||||
opts: RemoteConnectionOptions,
|
||||
delegate: &Arc<dyn RemoteClientDelegate>,
|
||||
delegate: Arc<dyn RemoteClientDelegate>,
|
||||
cx: &mut App,
|
||||
) -> Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>> {
|
||||
let connection = self.connections.get(&opts);
|
||||
|
||||
@@ -270,8 +270,6 @@ impl SshRemoteConnection {
|
||||
) -> Result<Self> {
|
||||
use askpass::AskPassResult;
|
||||
|
||||
delegate.set_status(Some("Connecting"), cx);
|
||||
|
||||
let url = connection_options.ssh_url();
|
||||
|
||||
let temp_dir = tempfile::Builder::new()
|
||||
@@ -285,6 +283,8 @@ impl SshRemoteConnection {
|
||||
let mut askpass =
|
||||
askpass::AskPassSession::new(cx.background_executor(), askpass_delegate).await?;
|
||||
|
||||
delegate.set_status(Some("Connecting"), cx);
|
||||
|
||||
// Start the master SSH process, which does not do anything except for establish
|
||||
// the connection and keep it open, allowing other ssh commands to reuse it
|
||||
// via a control socket.
|
||||
|
||||
Reference in New Issue
Block a user