diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs index 22e8bc06d4e430ae922d44ca4a3dc87948ebf6cd..5767ac54b7893f7425dfd56202b7512d17314f0f 100644 --- a/crates/client/src/client.rs +++ b/crates/client/src/client.rs @@ -798,7 +798,7 @@ impl Client { } } } - status = status_rx.next().fuse() => { + _ = status_rx.next().fuse() => { return Err(anyhow!("authentication canceled")); } } diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs index 9ec05e07c81fe0b48e19cf567f4ff137e62d527c..8a8fde88eeee92985a13b37291b0b428542ebb01 100644 --- a/crates/collab_ui/src/collab_panel.rs +++ b/crates/collab_ui/src/collab_panel.rs @@ -1976,21 +1976,18 @@ impl CollabPanel { let style = collab_theme.channel_name.inactive_state(); Flex::row() .with_child( - Label::new( - channel.name.clone().to_owned() + channel_id.to_string().as_str(), - style.text.clone(), - ) - .contained() - .with_style(style.container) - .aligned() - .left() - .with_tooltip::( - ix, - "Join channel", - None, - theme.tooltip.clone(), - cx, - ), + Label::new(channel.name.clone(), style.text.clone()) + .contained() + .with_style(style.container) + .aligned() + .left() + .with_tooltip::( + ix, + "Join channel", + None, + theme.tooltip.clone(), + cx, + ), ) .with_children({ let participants =