Merge branch 'master' of github.com:helix-editor/helix into line_ending_detection

Rebasing was making me manually fix conflicts on every commit, so
merging instead.

1 files changed, 7 insertions, 7 deletions

diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 6b39bb62..0e6a313d 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -178,13 +178,13 @@ pub trait AnyComponent {
     /// Returns a boxed any from a boxed self.
     ///
     /// Can be used before `Box::downcast()`.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// // let boxed: Box<Component> = Box::new(TextComponent::new("text"));
-    /// // let text: Box<TextComponent> = boxed.as_boxed_any().downcast().unwrap();
-    /// ```
+    //
+    // # Examples
+    //
+    // ```rust
+    // let boxed: Box<Component> = Box::new(TextComponent::new("text"));
+    // let text: Box<TextComponent> = boxed.as_boxed_any().downcast().unwrap();
+    // ```
     fn as_boxed_any(self: Box<Self>) -> Box<dyn Any>;
 }