Rust1.46 and nightly ci (#246)

Stephan Dilly · web-flow · commit 2401293b6625 · 2020-08-28T10:52:24.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,16 +14,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
+        rust: [nightly, stable]
 
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.rust == 'nightly' }}
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: ${{ matrix.rust }}
+        default: true
         profile: minimal
         components: clippy
 
diff --git a/asyncgit/src/sync/hunks.rs b/asyncgit/src/sync/hunks.rs
@@ -111,7 +111,13 @@ pub fn unstage_hunk(
 
     let diff = get_diff_raw(&repo, &file_path, true, true)?;
 
-    assert_eq!(diff.deltas().len(), diff_count_positive);
+    if diff.deltas().len() != diff_count_positive {
+        return Err(Error::Generic(format!(
+            "hunk error: {}!={}",
+            diff.deltas().len(),
+            diff_count_positive
+        )));
+    }
 
     let mut count = 0;
     {
diff --git a/src/cmdbar.rs b/src/cmdbar.rs
@@ -124,7 +124,7 @@ impl CommandBar {
         self.refresh_list(self.width);
     }
 
-    pub fn height(&self) -> u16 {
+    pub const fn height(&self) -> u16 {
         if self.expandable && self.expanded {
             self.lines
         } else {
diff --git a/src/components/command.rs b/src/components/command.rs
@@ -63,24 +63,28 @@ impl CommandInfo {
             order: 0,
         }
     }
+
     ///
     pub const fn order(self, order: i8) -> Self {
         let mut res = self;
         res.order = order;
         res
     }
+
     ///
     pub const fn hidden(self) -> Self {
         let mut res = self;
         res.quick_bar = false;
         res
     }
+
     ///
     pub fn print(&self, out: &mut String) {
         out.push_str(&self.text.name);
     }
+
     ///
-    pub fn show_in_quickbar(&self) -> bool {
+    pub const fn show_in_quickbar(&self) -> bool {
         self.quick_bar && self.available
     }
 }
diff --git a/src/components/commit.rs b/src/components/commit.rs
@@ -208,11 +208,10 @@ impl CommitComponent {
             return Ok(());
         }
 
-        let res = if let Some(amend) = self.amend {
-            sync::amend(CWD, amend, &msg)
-        } else {
-            sync::commit(CWD, &msg)
-        };
+        let res =
+            self.amend.map_or(sync::commit(CWD, &msg), |amend| {
+                sync::amend(CWD, amend, &msg)
+            });
         if let Err(e) = res {
             log::error!("commit error: {}", &e);
             self.queue.borrow_mut().push_back(
diff --git a/src/components/commit_details/details.rs b/src/components/commit_details/details.rs
@@ -69,11 +69,8 @@ impl DetailsComponent {
     ) -> Result<()> {
         self.tags.clear();
 
-        self.data = if let Some(id) = id {
-            sync::get_commit_details(CWD, id).ok()
-        } else {
-            None
-        };
+        self.data =
+            id.and_then(|id| sync::get_commit_details(CWD, id).ok());
 
         self.scroll_top.set(0);
 
diff --git a/src/components/commitlist.rs b/src/components/commitlist.rs
@@ -252,13 +252,11 @@ impl CommitList {
             .take(height)
             .enumerate()
         {
-            let tags = if let Some(tags) =
-                self.tags.as_ref().and_then(|t| t.get(&e.id))
-            {
-                Some(tags.join(" "))
-            } else {
-                None
-            };
+            let tags = self
+                .tags
+                .as_ref()
+                .and_then(|t| t.get(&e.id))
+                .map(|tags| tags.join(" "));
 
             Self::add_entry(
                 e,
diff --git a/src/components/diff.rs b/src/components/diff.rs
@@ -38,13 +38,13 @@ enum Selection {
 }
 
 impl Selection {
-    fn get_start(&self) -> usize {
+    const fn get_start(&self) -> usize {
         match self {
             Self::Single(start) | Self::Multiple(start, _) => *start,
         }
     }
 
-    fn get_end(&self) -> usize {
+    const fn get_end(&self) -> usize {
         match self {
             Self::Single(end) | Self::Multiple(_, end) => *end,
         }
@@ -447,7 +447,7 @@ impl DiffComponent {
         ));
     }
 
-    fn hunk_visible(
+    const fn hunk_visible(
         hunk_min: usize,
         hunk_max: usize,
         min: usize,
diff --git a/src/components/filetree.rs b/src/components/filetree.rs
@@ -113,14 +113,12 @@ impl FileTreeComponent {
 
     ///
     pub fn is_file_seleted(&self) -> bool {
-        if let Some(item) = self.tree.selected_item() {
+        self.tree.selected_item().map_or(false, |item| {
             match item.kind {
                 FileTreeItemKind::File(_) => true,
                 FileTreeItemKind::Path(..) => false,
             }
-        } else {
-            false
-        }
+        })
     }
 
     fn move_selection(&mut self, dir: MoveSelection) -> bool {
@@ -207,7 +205,7 @@ impl FileTreeComponent {
         }
     }
 
-    fn item_status_char(item_type: StatusItemType) -> char {
+    const fn item_status_char(item_type: StatusItemType) -> char {
         match item_type {
             StatusItemType::Modified => 'M',
             StatusItemType::New => '+',
diff --git a/src/components/textinput.rs b/src/components/textinput.rs
@@ -122,14 +122,11 @@ impl TextInputComponent {
             ));
         }
 
-        let cursor_str = if let Some(pos) = self.next_char_position()
-        {
-            &self.msg[self.cursor_position..pos]
-        } else {
+        let cursor_str = self
+            .next_char_position()
             // if the cursor is at the end of the msg
             // a whitespace is used to underline
-            " "
-        };
+            .map_or(" ", |pos| &self.msg[self.cursor_position..pos]);
 
         if cursor_str == "\n" {
             txt.push(Text::styled(
diff --git a/src/components/utils/statustree.rs b/src/components/utils/statustree.rs
@@ -44,17 +44,16 @@ impl StatusTree {
         let last_selection_index = self.selection.unwrap_or(0);
 
         self.tree = FileTreeItems::new(list, &last_collapsed)?;
-        self.selection =
-            if let Some(ref last_selection) = last_selection {
+        self.selection = last_selection.as_ref().map_or(
+            self.tree.items().first().map(|_| 0),
+            |last_selection| {
                 self.find_last_selection(
                     last_selection,
                     last_selection_index,
                 )
                 .or_else(|| self.tree.items().first().map(|_| 0))
-            } else {
-                // simply select first
-                self.tree.items().first().map(|_| 0)
-            };
+            },
+        );
 
         self.update_visibility(None, 0, true);
 
@@ -80,7 +79,7 @@ impl StatusTree {
 
     ///
     pub fn move_selection(&mut self, dir: MoveSelection) -> bool {
-        if let Some(selection) = self.selection {
+        self.selection.map_or(false, |selection| {
             let selection_change = match dir {
                 MoveSelection::Up => {
                     self.selection_updown(selection, true)
@@ -102,9 +101,7 @@ impl StatusTree {
             self.selection = Some(selection_change.new_index);
 
             changed_index || selection_change.changes
-        } else {
-            false
-        }
+        })
     }
 
     ///
diff --git a/src/main.rs b/src/main.rs
@@ -7,6 +7,7 @@
 #![deny(clippy::panic)]
 #![allow(clippy::module_name_repetitions)]
 #![allow(clippy::multiple_crate_versions)]
+#![warn(clippy::missing_const_for_fn)]
 
 mod app;
 mod cmdbar;
diff --git a/src/tabs/revlog.rs b/src/tabs/revlog.rs
@@ -158,15 +158,7 @@ impl Revlog {
         let tags = self.list.tags();
 
         commit.and_then(|commit| {
-            if let Some(tags) = tags {
-                if let Some(tags) = tags.get(&commit) {
-                    Some(tags.clone())
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
+            tags.and_then(|tags| tags.get(&commit).cloned())
         })
     }
 }
@@ -213,28 +205,32 @@ impl Component for Revlog {
                     self.update()?;
                     return Ok(true);
                 } else if k == self.key_config.log_tag_commit {
-                    return if let Some(id) = self.selected_commit() {
-                        self.queue
-                            .borrow_mut()
-                            .push_back(InternalEvent::TagCommit(id));
-                        Ok(true)
-                    } else {
-                        Ok(false)
-                    };
+                    return self.selected_commit().map_or(
+                        Ok(false),
+                        |id| {
+                            self.queue.borrow_mut().push_back(
+                                InternalEvent::TagCommit(id),
+                            );
+                            Ok(true)
+                        },
+                    );
                 } else if k == self.key_config.focus_right
                     && self.commit_details.is_visible()
                 {
-                    return if let Some(id) = self.selected_commit() {
-                        self.queue.borrow_mut().push_back(
-                            InternalEvent::InspectCommit(
-                                id,
-                                self.selected_commit_tags(&Some(id)),
-                            ),
-                        );
-                        Ok(true)
-                    } else {
-                        Ok(false)
-                    };
+                    return self.selected_commit().map_or(
+                        Ok(false),
+                        |id| {
+                            self.queue.borrow_mut().push_back(
+                                InternalEvent::InspectCommit(
+                                    id,
+                                    self.selected_commit_tags(&Some(
+                                        id,
+                                    )),
+                                ),
+                            );
+                            Ok(true)
+                        },
+                    );
                 } else {
                 }
             }
diff --git a/src/ui/style.rs b/src/ui/style.rs
@@ -116,7 +116,11 @@ impl Theme {
         self.apply_select(style, selected)
     }
 
-    fn apply_select(&self, style: Style, selected: bool) -> Style {
+    const fn apply_select(
+        &self,
+        style: Style,
+        selected: bool,
+    ) -> Style {
         if selected {
             style.bg(self.selection_bg)
         } else {

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ impl CommandBar {`
`124`	`124`	`self.refresh_list(self.width);`
`125`	`125`	`}`
`126`	`126`
`127`		`- pub fn height(&self) -> u16 {`
	`127`	`+ pub const fn height(&self) -> u16 {`
`128`	`128`	`if self.expandable && self.expanded {`
`129`	`129`	`self.lines`
`130`	`130`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -63,24 +63,28 @@ impl CommandInfo {`
`63`	`63`	`order: 0,`
`64`	`64`	`}`
`65`	`65`	`}`
	`66`	`+`
`66`	`67`	`///`
`67`	`68`	`pub const fn order(self, order: i8) -> Self {`
`68`	`69`	`let mut res = self;`
`69`	`70`	`res.order = order;`
`70`	`71`	`res`
`71`	`72`	`}`
	`73`	`+`
`72`	`74`	`///`
`73`	`75`	`pub const fn hidden(self) -> Self {`
`74`	`76`	`let mut res = self;`
`75`	`77`	`res.quick_bar = false;`
`76`	`78`	`res`
`77`	`79`	`}`
	`80`	`+`
`78`	`81`	`///`
`79`	`82`	`pub fn print(&self, out: &mut String) {`
`80`	`83`	`out.push_str(&self.text.name);`
`81`	`84`	`}`
	`85`	`+`
`82`	`86`	`///`
`83`		`- pub fn show_in_quickbar(&self) -> bool {`
	`87`	`+ pub const fn show_in_quickbar(&self) -> bool {`
`84`	`88`	`self.quick_bar && self.available`
`85`	`89`	`}`
`86`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,13 @@ enum Selection {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`impl Selection {`
`41`		`- fn get_start(&self) -> usize {`
	`41`	`+ const fn get_start(&self) -> usize {`
`42`	`42`	`match self {`
`43`	`43`	`Self::Single(start) \| Self::Multiple(start, _) => *start,`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- fn get_end(&self) -> usize {`
	`47`	`+ const fn get_end(&self) -> usize {`
`48`	`48`	`match self {`
`49`	`49`	`Self::Single(end) \| Self::Multiple(_, end) => *end,`
`50`	`50`	`}`
`@@ -447,7 +447,7 @@ impl DiffComponent {`
`447`	`447`	`));`
`448`	`448`	`}`
`449`	`449`
`450`		`- fn hunk_visible(`
	`450`	`+ const fn hunk_visible(`
`451`	`451`	`hunk_min: usize,`
`452`	`452`	`hunk_max: usize,`
`453`	`453`	`min: usize,`
Original file line number	Diff line number	Diff line change
`@@ -113,14 +113,12 @@ impl FileTreeComponent {`
`113`	`113`
`114`	`114`	`///`
`115`	`115`	`pub fn is_file_seleted(&self) -> bool {`
`116`		`- if let Some(item) = self.tree.selected_item() {`
	`116`	`+ self.tree.selected_item().map_or(false, \|item\| {`
`117`	`117`	`match item.kind {`
`118`	`118`	`FileTreeItemKind::File(_) => true,`
`119`	`119`	`FileTreeItemKind::Path(..) => false,`
`120`	`120`	`}`
`121`		`- } else {`
`122`		`- false`
`123`		`- }`
	`121`	`+ })`
`124`	`122`	`}`
`125`	`123`
`126`	`124`	`fn move_selection(&mut self, dir: MoveSelection) -> bool {`
`@@ -207,7 +205,7 @@ impl FileTreeComponent {`
`207`	`205`	`}`
`208`	`206`	`}`
`209`	`207`
`210`		`- fn item_status_char(item_type: StatusItemType) -> char {`
	`208`	`+ const fn item_status_char(item_type: StatusItemType) -> char {`
`211`	`209`	`match item_type {`
`212`	`210`	`StatusItemType::Modified => 'M',`
`213`	`211`	`StatusItemType::New => '+',`