update: QuestionModelContainer removed to favour immutable keys

Author: akarsh1995

CHANGELOG.md

@@ -28,9 +28,11 @@ All notable changes to this project will be documented in this file.
 
 - Neetcode 75 question list.
 
-### Fixed
+### Changed
 
 - Not null constraints on the fields that are never null from the server.
+- `QuestionModelContainer { question: RefCell<QuestionModel> }` changed to `Rc<RefCell<QuestionModel>>`
+    - As prior implemented hash. Hashables should not be mutable.
 
 ## [0.2.0] - 2023-07-30
 

src/app_ui/components/list.rs

@@ -1,10 +1,9 @@
 use ratatui::widgets::ListState;
-use std::rc::Rc;
 
 #[derive(Debug, Clone)]
 pub struct StatefulList<T> {
     pub state: ListState,
-    pub items: Vec<Rc<T>>,
+    pub items: Vec<T>,
 }
 
 impl<T> Default for StatefulList<T> {
@@ -21,10 +20,10 @@ impl<T> StatefulList<T> {
         if self.items.is_empty() {
             self.state.select(Some(0))
         }
-        self.items.push(Rc::new(item))
+        self.items.push(item)
     }
 
-    pub fn get_selected_item(&self) -> Option<&Rc<T>> {
+    pub fn get_selected_item(&self) -> Option<&T> {
         match self.state.selected() {
             Some(i) => Some(&self.items[i]),
             None => None,
@@ -38,7 +37,7 @@ impl<T> StatefulList<T> {
         }
         StatefulList {
             state: list_state,
-            items: items.into_iter().map(|item| Rc::new(item)).collect(),
+            items,
         }
     }
 

src/app_ui/components/popups/selection_list.rs

@@ -60,7 +60,7 @@ impl Component for SelectionListPopup {
             .items
             .iter()
             .map(|item| {
-                let line_text = item.as_ref();
+                let line_text = item;
                 ListItem::new(Span::styled(line_text, Style::default()))
             })
             .collect::<Vec<_>>();

src/app_ui/helpers/question.rs

@@ -1,24 +1,9 @@
 use std::{cell::RefCell, rc::Rc};
 
 use crate::entities::QuestionModel;
-use std::hash::Hash;
-
-#[derive(PartialEq, Eq, Debug, Ord, PartialOrd)]
-pub struct QuestionModelContainer {
-    pub question: RefCell<QuestionModel>,
-}
-
-// RefCell keys are mutable and should not be used in types where hashing
-// is required. This implementation is valid until question_frontend_id change.
-// For more refer https://rust-lang.github.io/rust-clippy/master/index.html#/mutable_key_type
-impl Hash for QuestionModelContainer {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.question.borrow().hash(state)
-    }
-}
 
 pub struct Stats<'a> {
-    pub qm: &'a Vec<Rc<QuestionModelContainer>>,
+    pub qm: &'a Vec<Rc<RefCell<QuestionModel>>>,
 }
 
 impl<'a> Stats<'a> {
@@ -66,8 +51,8 @@ impl<'a> Stats<'a> {
         self.qm
             .iter()
             .filter(|q| {
-                if let Some(st) = &q.question.borrow().status {
-                    st.as_str() == status && difficulty == q.question.borrow().difficulty.as_str()
+                if let Some(st) = &q.borrow().status {
+                    st.as_str() == status && difficulty == q.borrow().difficulty.as_str()
                 } else {
                     false
                 }
@@ -79,7 +64,7 @@ impl<'a> Stats<'a> {
         self.qm
             .iter()
             .filter(|q| {
-                if let Some(st) = &q.question.borrow().status {
+                if let Some(st) = &q.borrow().status {
                     st.as_str() == status
                 } else {
                     false
@@ -91,7 +76,7 @@ impl<'a> Stats<'a> {
     fn get_diff_count(&self, difficulty: &str) -> usize {
         self.qm
             .iter()
-            .filter(|q| q.question.borrow().difficulty.as_str() == difficulty)
+            .filter(|q| q.borrow().difficulty.as_str() == difficulty)
             .count()
     }
 }

src/app_ui/widgets/notification.rs

@@ -1,12 +1,11 @@
-use std::rc::Rc;
+use std::{cell::RefCell, rc::Rc};
 
-use crate::app_ui::helpers::question::QuestionModelContainer;
 use crate::{
     app_ui::components::{
         help_text::HelpText,
         popups::{paragraph::ParagraphPopup, selection_list::SelectionListPopup},
     },
-    entities::TopicTagModel,
+    entities::{QuestionModel, TopicTagModel},
 };
 
 #[derive(Debug, Clone)]
@@ -54,7 +53,7 @@ impl<T> NotifContent<T> {
 #[derive(Debug, Clone)]
 pub enum Notification {
     Questions(NotifContent<Vec<TopicTagModel>>),
-    Stats(NotifContent<Vec<Rc<QuestionModelContainer>>>),
+    Stats(NotifContent<Vec<Rc<RefCell<QuestionModel>>>>),
     Popup(NotifContent<PopupMessage>),
     HelpText(NotifContent<IndexSet<HelpText>>),
     Event(NotifContent<KeyEvent>),