From 5ab3466e2bbf85bd0f696d494025aa6d4ed0125d Mon Sep 17 00:00:00 2001
From: Peng Guanwen <pg999w@outlook.com>
Date: Fri, 18 Jan 2019 22:46:18 +0800
Subject: [PATCH] Doc improvements

---
 components/rendering/src/markdown.rs | 35 ++++++++++++++--------------
 components/utils/src/vec.rs          |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/components/rendering/src/markdown.rs b/components/rendering/src/markdown.rs
index 6279e73..01e31af 100644
--- a/components/rendering/src/markdown.rs
+++ b/components/rendering/src/markdown.rs
@@ -28,16 +28,17 @@ pub struct Rendered {
     pub toc: Vec<Header>,
 }
 
+// tracks a header in a slice of pulldown-cmark events
 #[derive(Debug)]
-struct HeaderIndex {
-    start: usize,
-    end: usize,
+struct HeaderRef {
+    start_idx: usize,
+    end_idx: usize,
     level: i32,
 }
 
-impl HeaderIndex {
-    fn new(start: usize, level: i32) -> HeaderIndex {
-        HeaderIndex { start, end: 0, level }
+impl HeaderRef {
+    fn new(start: usize, level: i32) -> HeaderRef {
+        HeaderRef { start_idx: start, end_idx: 0, level }
     }
 }
 
@@ -110,23 +111,23 @@ fn get_text(parser_slice: &[Event]) -> String {
     title
 }
 
-fn get_header_indexes(events: &[Event]) -> Vec<HeaderIndex> {
-    let mut header_indexes = vec![];
+fn get_header_refs(events: &[Event]) -> Vec<HeaderRef> {
+    let mut header_refs = vec![];
 
     for (i, event) in events.iter().enumerate() {
         match event {
             Event::Start(Tag::Header(level)) => {
-                header_indexes.push(HeaderIndex::new(i, *level));
+                header_refs.push(HeaderRef::new(i, *level));
             }
             Event::End(Tag::Header(_)) => {
                 let msg = "Header end before start?";
-                header_indexes.last_mut().expect(msg).end = i;
+                header_refs.last_mut().expect(msg).end_idx = i;
             }
             _ => (),
         }
     }
 
-    header_indexes
+    header_refs
 }
 
 pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<Rendered> {
@@ -220,19 +221,19 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<Render
             }
         }).collect::<Vec<_>>(); // We need to collect the events to make a second pass
 
-        let mut header_indexes = get_header_indexes(&events);
+        let header_refs = get_header_refs(&events);
 
         let mut anchors_to_insert = vec![];
 
-        for header_idx in header_indexes {
-            let start_idx = header_idx.start;
-            let end_idx = header_idx.end;
+        for header_ref in header_refs {
+            let start_idx = header_ref.start_idx;
+            let end_idx = header_ref.end_idx;
             let title = get_text(&events[start_idx + 1 .. end_idx]);
             let id = find_anchor(&inserted_anchors, slugify(&title), 0);
             inserted_anchors.push(id.clone());
 
             // insert `id` to the tag
-            let html = format!("<h{lvl} id=\"{id}\">", lvl = header_idx.level, id = id);
+            let html = format!("<h{lvl} id=\"{id}\">", lvl = header_ref.level, id = id);
             events[start_idx] = Event::Html(Owned(html));
 
             // generate anchors and places to insert them
@@ -250,7 +251,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<Render
 
             // record header to make table of contents
             let permalink = format!("{}#{}", context.current_page_permalink, id);
-            let temp_header = TempHeader { level: header_idx.level, id, permalink, title };
+            let temp_header = TempHeader { level: header_ref.level, id, permalink, title };
             headers.push(temp_header);
         }
 
diff --git a/components/utils/src/vec.rs b/components/utils/src/vec.rs
index eac02dc..778de4a 100644
--- a/components/utils/src/vec.rs
+++ b/components/utils/src/vec.rs
@@ -7,7 +7,7 @@ impl<T> InsertMany for Vec<T> {
     type Element = T;
 
     /// Efficiently insert multiple element in their specified index.
-    /// The index should be sorted in ascending order.
+    /// The elements should sorted in ascending order by their index.
     ///
     /// This is done in O(n) time.
     fn insert_many(&mut self, elem_to_insert: Vec<(usize, T)>) {