diff --git a/Cargo.toml b/Cargo.toml index 46a7ad990b..77118bce3f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -412,7 +412,6 @@ almost_complete_range = "allow" arc_with_non_send_sync = "allow" borrowed_box = "allow" derive_ord_xor_partial_ord = "allow" -eq_op = "allow" let_underscore_future = "allow" map_entry = "allow" non_canonical_clone_impl = "allow" diff --git a/crates/language_tools/src/syntax_tree_view.rs b/crates/language_tools/src/syntax_tree_view.rs index 6b5b325ee7..c4d478b16e 100644 --- a/crates/language_tools/src/syntax_tree_view.rs +++ b/crates/language_tools/src/syntax_tree_view.rs @@ -148,7 +148,7 @@ impl SyntaxTreeView { if did_reparse { prev_layer = buffer_state.active_layer.take(); } - if buffer_state.buffer != buffer || buffer_state.excerpt_id != buffer_state.excerpt_id { + if buffer_state.buffer != buffer || buffer_state.excerpt_id != excerpt_id { buffer_state.buffer = buffer.clone(); buffer_state.excerpt_id = excerpt_id; buffer_state.active_layer = None; diff --git a/crates/story/src/story.rs b/crates/story/src/story.rs index ff7b2bed86..cd8e77590d 100644 --- a/crates/story/src/story.rs +++ b/crates/story/src/story.rs @@ -37,10 +37,10 @@ impl StoryColor { primary: hsla(216. / 360., 11. / 100., 0. / 100., 1.), secondary: hsla(216. / 360., 11. / 100., 16. / 100., 1.), border: hsla(216. / 360., 11. / 100., 91. / 100., 1.), - background: hsla(0. / 360., 0. / 100., 100. / 100., 1.), + background: hsla(0. / 360., 0. / 100., 1., 1.), card_background: hsla(0. / 360., 0. / 100., 96. / 100., 1.), divider: hsla(216. / 360., 11. / 100., 86. / 100., 1.), - link: hsla(206. / 360., 100. / 100., 50. / 100., 1.), + link: hsla(206. / 360., 1., 50. / 100., 1.), } } } diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 2cc3d61964..cced552b10 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -2663,7 +2663,7 @@ impl Workspace { if self .follower_states .values() - .all(|state| state.leader_id != state.leader_id) + .all(|state| state.leader_id != leader_id) { let project_id = self.project.read(cx).remote_id(); let room_id = self.active_call()?.read(cx).room()?.read(cx).id();