{"header":{"message":"fix: modularize subtype & manually impl some stuff","description":null,"timestamp":"2024-02-22T19:38:47.916227392Z","authors":[{}]},"hash":"HXVQ65W4R5U2H2TMOJAPOSD53HKRJFWNZUQHOHPHYQVUQUFZEK2AC","authors":[{"login":"Jengamon","key":"47a75hR6eVaawZfVGBs2CqZUKZbcNz5Ago5CubrCkWvZ"}],"deps":{"hashes":[["HXVQ65W4R5U2H2TMOJAPOSD53HKRJFWNZUQHOHPHYQVUQUFZEK2AC","fix: modularize subtype & manually impl some stuff"],["AA",null],["JXEK5JUJZ5FI7AD4RLHLXUNT6S3WPRYODJ2AEX27BX6NOWXMCGGQC","fix: use Eq in subtype casing test"],["GVQM77M3PEI6CNAZ5D3ITAUYNRXN5WZCYDA5XKNWODJDCQZDT4ZAC","fix: doc"],["ZF56C27EEGGCNYIEHTNWAADHGWVFLIFCFQIF7QCIA2X4P34RYGRAC","fix: allow colon to act as separator"],["CBHAADI53H7FRULYWHEKEJPUSEYTS3OS4CO6DHEKGN6UIXBKWUFAC","fix: Box for Arc, as Arc was unnecessary here"],["N2FJS2IUBXXPSBQMKMEADLN4DVQCWUC7Z73NNGD2VAIROM52XVJAC","fix: refine quasimembership detection to allow more strings"],["OIHFLPCUKJPPR6TJ6TSZC4NJVHJZUREF4TDS7KRV3EDAO65PQX3AC","feat(test): test subtype whitespace rules"],["J4NOGTKD7PUHMTINZUONRST3KMTSU4A5BSFZN7HMYCK4VNETKFNAC","fix: subtypes cannot be separators"],["EBA7UTSXZ3TMWSSESVZKJXHBEYWAOOMOZ7627HMOQ2JBSVMUNEGQC","fix: unify subype regexes"],["GYVESXMMN2WA6ZE4NHRFIBVD5E62CWC4BGQHP24GYJQ6WJB2G2YAC","generating mana experiment ui"],["X7KNY5KWCOLA2V345PUT4EVXVNHL6RGSJK3NNR6DHPOUC33HHCCAC","feat: add subtype struct"],["3ZXXZNMR6EA4HB4AFWBMTESO6QOYFOL2MBEJ534O22OYA22HSKGAC","start writing"]],"deps":["JXEK5JUJZ5FI7AD4RLHLXUNT6S3WPRYODJ2AEX27BX6NOWXMCGGQC","GVQM77M3PEI6CNAZ5D3ITAUYNRXN5WZCYDA5XKNWODJDCQZDT4ZAC","ZF56C27EEGGCNYIEHTNWAADHGWVFLIFCFQIF7QCIA2X4P34RYGRAC","CBHAADI53H7FRULYWHEKEJPUSEYTS3OS4CO6DHEKGN6UIXBKWUFAC"],"known":["GYVESXMMN2WA6ZE4NHRFIBVD5E62CWC4BGQHP24GYJQ6WJB2G2YAC","X7KNY5KWCOLA2V345PUT4EVXVNHL6RGSJK3NNR6DHPOUC33HHCCAC","EBA7UTSXZ3TMWSSESVZKJXHBEYWAOOMOZ7627HMOQ2JBSVMUNEGQC","N2FJS2IUBXXPSBQMKMEADLN4DVQCWUC7Z73NNGD2VAIROM52XVJAC","OIHFLPCUKJPPR6TJ6TSZC4NJVHJZUREF4TDS7KRV3EDAO65PQX3AC","J4NOGTKD7PUHMTINZUONRST3KMTSU4A5BSFZN7HMYCK4VNETKFNAC"]},"hunks":[{"Replacement":{"inode":{"change":6,"pos":16647},"path":"src/app/card.rs","line":1,"ins":{"up_context":[{"change":6,"pos":16647}],"down_context":[{"change":6,"pos":103}],"flag":"BLOCK","start":0,"end":45,"inode":{"change":6,"pos":16647}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16647},"to":{"change":6,"start":0,"end":103},"introduced_by":6}],"inode":{"change":6,"pos":16647}},"ins_contents":[{"Add":"mod subtype;"},{"Add":"pub use self::subtype::Subtype;"}],"del_contents":[{"Del":"use regex::Regex;\nuse std::{\n collections::{HashMap, HashSet},\n sync::{Arc, Mutex, OnceLock},\n};\n"}]}},{"Edit":{"inode":{"change":6,"pos":16647},"path":"src/app/card.rs","line":21,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":602},"to":{"change":6,"start":602,"end":605},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":605},"to":{"change":6,"start":0,"end":39},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":39},"to":{"change":6,"start":606,"end":865},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16672},"to":{"change":6,"start":606,"end":865},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":865},"to":{"change":4,"start":0,"end":69},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":6,"pos":64},"to":{"change":6,"start":865,"end":949},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":4,"pos":69},"to":{"change":6,"start":865,"end":949},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":865},"to":{"change":6,"start":865,"end":949},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":949},"to":{"change":3,"start":132,"end":189},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":189},"to":{"change":6,"start":997,"end":1431},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":997},"to":{"change":6,"start":997,"end":1431},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1431},"to":{"change":6,"start":0,"end":8},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":8},"to":{"change":4,"start":70,"end":140},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":6,"pos":77},"to":{"change":6,"start":1431,"end":1505},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":4,"pos":140},"to":{"change":6,"start":1431,"end":1505},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1431},"to":{"change":6,"start":1431,"end":1505},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1505},"to":{"change":5,"start":0,"end":93},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":93},"to":{"change":6,"start":1598,"end":1795},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1598},"to":{"change":6,"start":1598,"end":1795},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1795},"to":{"change":5,"start":94,"end":161},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":6,"pos":67},"to":{"change":6,"start":1847,"end":1908},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":5,"pos":161},"to":{"change":6,"start":1847,"end":1908},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1847},"to":{"change":6,"start":1847,"end":1908},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1908},"to":{"change":4,"start":141,"end":194},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":6,"pos":129},"to":{"change":6,"start":1939,"end":2138},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":4,"pos":194},"to":{"change":6,"start":1939,"end":2138},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1939},"to":{"change":6,"start":1939,"end":2138},"introduced_by":6}],"inode":{"change":6,"pos":16647}}},"contents":[{"Del":"}\n\n"},{"Del":"#[derive(Debug, Clone, PartialEq, Eq)]\n"},{"Del":"pub struct Subtype(HashSet>);\n\nimpl Subtype {\n pub fn new>(subtype: S) -> Self {\n Self(\n subtype\n .as_ref()\n .trim()\n .to_lowercase()\n .split_whitespace()\n"},{"Del":" .filter(|s| ![\"-\", \"+\", \"/\", r\"\\\", \":\"].contains(s))\n"},{"Del":" .map(|s| Arc::from(s))\n .collect(),\n )\n }\n\n"},{"Del":" /// Provide an [`ExactSizeIterator`] of all subtypes\n"},{"Del":" pub fn subtypes(&self) -> impl ExactSizeIterator {\n self.0.iter().map(|s| s.as_ref())\n }\n\n /// Check if this subtype is a member of a given subtype group\n pub fn is_member>(&self, member: S) -> bool {\n let member = member.as_ref().to_lowercase();\n self.0.iter().any(|sm| sm.as_ref() == member)\n }\n\n /// Check if this subtype is a quasimember of a given subtype group\n"},{"Del":" ///\n"},{"Del":" /// Quasimembership is defined for strings separated by `[-+/\\:]`\n"},{"Del":" pub fn is_quasimember>(&self, quasimember: S) -> bool {\n"},{"Del":" static SUBTYPE_REGEXES: OnceLock, Regex>>> = OnceLock::new();\n"},{"Del":" let mut subtype_regex_map = SUBTYPE_REGEXES\n .get_or_init(|| Mutex::new(HashMap::new()))\n .lock()\n .unwrap();\n let subtype_regex = subtype_regex_map\n"},{"Del":" .entry(Box::from(quasimember.as_ref().to_lowercase()))\n"},{"Del":" .or_insert(\n Regex::new(&format!(\n"},{"Del":" r\"(\\A|[-+/\\\\:]){}(\\z|[-+/\\\\:])\",\n"},{"Del":" regex::escape(&quasimember.as_ref().to_lowercase())\n ))\n .unwrap(),\n );\n self.0.iter().any(|sm| subtype_regex.is_match(&sm))\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":16647},"path":"src/app/card.rs","line":25,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16747},"to":{"change":6,"start":2141,"end":3044},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3044},"to":{"change":2,"start":0,"end":105},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":105},"to":{"change":6,"start":40,"end":253},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3044},"to":{"change":6,"start":40,"end":253},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":253},"to":{"change":6,"start":130,"end":632},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3044},"to":{"change":6,"start":130,"end":632},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":632},"to":{"change":6,"start":3044,"end":3050},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3044},"to":{"change":6,"start":3044,"end":3050},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3050},"to":{"change":6,"start":3050,"end":3052},"introduced_by":6}],"inode":{"change":6,"pos":16647}}},"contents":[{"Del":"\n#[cfg(test)]\nmod tests {\n use super::Subtype;\n\n #[test]\n fn membership_will_only_match_whole_subtypes() {\n let subtype = Subtype::new(\"Mad Relic\");\n let subtype2 = Subtype::new(\"Mad-Devouring Dragon\");\n\n assert!(subtype.is_member(\"Mad\"));\n assert!(!subtype2.is_member(\"Mad\"));\n }\n\n #[test]\n fn quasimembership_matches_words_in_subtypes() {\n let subtype = Subtype::new(\"Mad Relic\");\n let subtype2 = Subtype::new(\"Mad-Devouring Dragon\");\n\n assert!(subtype.is_quasimember(\"Mad\"));\n assert!(subtype2.is_quasimember(\"Mad\"));\n assert!(!subtype2.is_quasimember(\"evo\"));\n }\n\n #[test]\n fn membership_and_quasimembership_are_caseinsensitive() {\n let subtype = Subtype::new(\"Magic-Spellcaster Ruler\");\n\n assert!(subtype.is_member(\"MAGIC-SPELLCASTER\"));\n assert!(subtype.is_quasimember(\"SPELLcAsTeR\"));\n"},{"Del":"\n let subtype2 = Subtype::new(\"MAGIC-SPELLcaster RULer\");\n\n assert_eq!(subtype, subtype2);\n"},{"Del":" }\n\n #[test]\n fn whitespace_doesnt_affect_subtype() {\n let subtype = Subtype::new(\"Magic Ruler\");\n let subtype2 = Subtype::new(\"Magic \\n\\t\\t Ruler\");\n\n assert_eq!(subtype, subtype2);\n"},{"Del":" }\n\n #[test]\n fn valid_unicode_subtypes() {\n let subtype = Subtype::new(\"Hailstone (-_-/ 😻-Ruler\");\n\n assert!(subtype.is_member(\"(-_-/\"));\n assert!(subtype.is_member(\"😻-ruler\"));\n assert!(subtype.is_quasimember(\"(-_-/\"));\n assert!(subtype.is_quasimember(\"(\"));\n assert!(subtype.is_quasimember(\"_\"));\n assert!(subtype.is_quasimember(\"/\"));\n assert!(subtype.is_quasimember(\"😻\"));\n assert!(subtype.is_quasimember(\"Ruler\"));\n"},{"Del":" }\n"},{"Del":"}\n"}]}},{"FileAdd":{"meta":{"basename":"card","metadata":576},"context":[{"change":13,"pos":400}],"contents":[]}},{"FileAdd":{"meta":{"basename":"subtype.rs","metadata":0},"context":[{"change":0,"pos":62}],"contents":[{"Add":"use heck::ToTrainCase;"},{"Add":"use regex::Regex;"},{"Add":"use serde::de::Visitor;"},{"Add":"use std::{"},{"Add":" collections::{HashMap, HashSet},"},{"Add":" fmt,"},{"Add":" sync::{Arc, Mutex, OnceLock},"},{"Add":"};"},{"Add":""},{"Add":"#[derive(Debug, Clone)]"},{"Add":"pub struct Subtype(HashSet>, Arc);"},{"Add":""},{"Add":"impl PartialEq for Subtype {"},{"Add":" fn eq(&self, other: &Self) -> bool {"},{"Add":" self.0 == other.0"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Eq for Subtype {}"},{"Add":""},{"Add":"impl serde::Serialize for Subtype {"},{"Add":" fn serialize(&self, serializer: S) -> Result"},{"Add":" where"},{"Add":" S: serde::Serializer,"},{"Add":" {"},{"Add":" serializer.serialize_str(&format!(\"{self}\"))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub(crate) struct SubtypeVisitor;"},{"Add":""},{"Add":"impl<'de> Visitor<'de> for SubtypeVisitor {"},{"Add":" type Value = Box;"},{"Add":" fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" formatter.write_str(\"a string of space separated subtypes\")"},{"Add":" }"},{"Add":""},{"Add":" fn visit_str(self, v: &str) -> Result"},{"Add":" where"},{"Add":" E: serde::de::Error,"},{"Add":" {"},{"Add":" Ok(Box::from(v))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'de> serde::Deserialize<'de> for Subtype {"},{"Add":" fn deserialize(deserializer: D) -> Result"},{"Add":" where"},{"Add":" D: serde::Deserializer<'de>,"},{"Add":" {"},{"Add":" deserializer"},{"Add":" .deserialize_str(SubtypeVisitor)"},{"Add":" .map(Subtype::new)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for Subtype {"},{"Add":" fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {"},{"Add":" write!("},{"Add":" f,"},{"Add":" \"{}\","},{"Add":" self.1"},{"Add":" .split_whitespace()"},{"Add":" .map(|s| s.to_train_case())"},{"Add":" .collect::>()"},{"Add":" .join(\" \")"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Subtype {"},{"Add":" pub fn new>(subtype: S) -> Self {"},{"Add":" Self("},{"Add":" subtype"},{"Add":" .as_ref()"},{"Add":" .trim()"},{"Add":" .to_lowercase()"},{"Add":" .split_whitespace()"},{"Add":" .filter(|s| ![\"-\", \"+\", \"/\", r\"\\\", \":\"].contains(s))"},{"Add":" .map(|s| Arc::from(s))"},{"Add":" .collect(),"},{"Add":" Arc::from(subtype.as_ref().trim().to_lowercase()),"},{"Add":" )"},{"Add":" }"},{"Add":""},{"Add":" /// Provide an [`ExactSizeIterator`] of all subtypes"},{"Add":" pub fn subtypes(&self) -> impl ExactSizeIterator {"},{"Add":" self.0.iter().map(|s| s.as_ref())"},{"Add":" }"},{"Add":""},{"Add":" /// Check if this subtype is a member of a given subtype group"},{"Add":" pub fn is_member>(&self, member: S) -> bool {"},{"Add":" let member = member.as_ref().to_lowercase();"},{"Add":" self.0.iter().any(|sm| sm.as_ref() == member)"},{"Add":" }"},{"Add":""},{"Add":" /// Check if this subtype is a quasimember of a given subtype group"},{"Add":" ///"},{"Add":" /// Quasimembership is defined for strings separated by `[-+/\\:]`"},{"Add":" pub fn is_quasimember>(&self, quasimember: S) -> bool {"},{"Add":" pub(crate) static SUBTYPE_REGEXES: OnceLock, Regex>>> ="},{"Add":" OnceLock::new();"},{"Add":" let mut subtype_regex_map = SUBTYPE_REGEXES"},{"Add":" .get_or_init(|| Mutex::new(HashMap::new()))"},{"Add":" .lock()"},{"Add":" .unwrap();"},{"Add":" let subtype_regex = subtype_regex_map"},{"Add":" .entry(Box::from(quasimember.as_ref().to_lowercase()))"},{"Add":" .or_insert("},{"Add":" Regex::new(&format!("},{"Add":" r\"(\\A|[-+/\\\\:]){}(\\z|[-+/\\\\:])\","},{"Add":" regex::escape(&quasimember.as_ref().to_lowercase())"},{"Add":" ))"},{"Add":" .unwrap(),"},{"Add":" );"},{"Add":" self.0.iter().any(|sm| subtype_regex.is_match(&sm))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"mod tests {"},{"Add":" use super::Subtype;"},{"Add":""},{"Add":" #[test]"},{"Add":" fn membership_will_only_match_whole_subtypes() {"},{"Add":" let subtype = Subtype::new(\"Mad Relic\");"},{"Add":" let subtype2 = Subtype::new(\"Mad-Devouring Dragon\");"},{"Add":""},{"Add":" assert!(subtype.is_member(\"Mad\"));"},{"Add":" assert!(!subtype2.is_member(\"Mad\"));"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn quasimembership_matches_words_in_subtypes() {"},{"Add":" let subtype = Subtype::new(\"Mad Relic\");"},{"Add":" let subtype2 = Subtype::new(\"Mad-Devouring Dragon\");"},{"Add":""},{"Add":" assert!(subtype.is_quasimember(\"Mad\"));"},{"Add":" assert!(subtype2.is_quasimember(\"Mad\"));"},{"Add":" assert!(!subtype2.is_quasimember(\"evo\"));"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn membership_and_quasimembership_are_caseinsensitive() {"},{"Add":" let subtype = Subtype::new(\"Magic-Spellcaster Ruler\");"},{"Add":""},{"Add":" assert!(subtype.is_member(\"MAGIC-SPELLCASTER\"));"},{"Add":" assert!(subtype.is_quasimember(\"SPELLcAsTeR\"));"},{"Add":""},{"Add":" let subtype2 = Subtype::new(\"MAGIC-SPELLcaster RULer\");"},{"Add":""},{"Add":" assert_eq!(subtype, subtype2);"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn whitespace_doesnt_affect_subtype() {"},{"Add":" let subtype = Subtype::new(\"Magic Ruler\");"},{"Add":" let subtype2 = Subtype::new(\"Magic \\n\\t\\t Ruler\");"},{"Add":""},{"Add":" assert_eq!(subtype, subtype2);"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn valid_unicode_subtypes() {"},{"Add":" let subtype = Subtype::new(\"Hailstone (-_-/ 😻-Ruler\");"},{"Add":""},{"Add":" assert!(subtype.is_member(\"(-_-/\"));"},{"Add":" assert!(subtype.is_member(\"😻-ruler\"));"},{"Add":" assert!(subtype.is_quasimember(\"(-_-/\"));"},{"Add":" assert!(subtype.is_quasimember(\"(\"));"},{"Add":" assert!(subtype.is_quasimember(\"_\"));"},{"Add":" assert!(subtype.is_quasimember(\"/\"));"},{"Add":" assert!(subtype.is_quasimember(\"😻\"));"},{"Add":" assert!(subtype.is_quasimember(\"Ruler\"));"},{"Add":" }"},{"Add":"}"}]}}],"owner":"Jengamon","repo":"magister_testbed","token":"kxCrrnckzxI+ieu90CIPsV6FI9wNzWzvpn1QcUEoq18=","login":null}

…

Dependencies

Change contents