Merge branch '36-fix-code-scanning-alert---usage-of-a-legacy-numeric-constant' into main

Author: PtPrashantTripathi

Cargo.lock

@@ -1,7 +1,6 @@
 use std::fmt::Display;
 use std::ops::Deref;
 use std::ptr;
-use std::u8::MAX;
 
 use super::aadesh::Aadesh;
 use super::dosa_nirupaka;
@@ -33,9 +32,15 @@ pub struct Aadhaar {
     prarambhkarta_string: GcRef<Vakya>,
 }
 
+impl Default for Aadhaar {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Aadhaar {
     const ADHIKTAM_KOSHA: usize = 64;
-    const ADHIKTAM_RASHI: usize = Aadhaar::ADHIKTAM_KOSHA * (MAX as usize) + 1;
+    const ADHIKTAM_RASHI: usize = Aadhaar::ADHIKTAM_KOSHA * (u8::MAX as usize) + 1;
 
     pub fn new() -> Self {
         let mut gc = Gc::new();
@@ -614,7 +619,7 @@ impl Aadhaar {
                 }
                 paddhati_name => {
                     return self.anusthanakale_dosa(
-                        format!("{} सूचिस्य पद्धतिरन्यत् न भवति", paddhati_name).as_str(), //is not a paddhati of list
+                        format!("{paddhati_name} सूचिस्य पद्धतिरन्यत् न भवति").as_str(), //is not a paddhati of list
                     );
                 }
             }

core/src/aadhaar.rs

@@ -10,30 +10,30 @@ pub struct Disassembler<'vm> {
 impl<'vm> Disassembler<'vm> {
     fn const_aadesh(&self, op: &str, achar_anukram: u8) {
         let mulya = self.vastu.achar[achar_anukram as usize];
-        println!("{:<16} {:4} ({})", op, achar_anukram, mulya);
+        println!("{op:<16} {achar_anukram:4} ({mulya})");
     }
 
     fn const_list_aadesh(&self, op: &str, achar_anukram: u16) {
         let mulya = self.vastu.achar[achar_anukram as usize];
-        println!("{:<16} {:4} ({})", op, achar_anukram, mulya);
+        println!("{op:<16} {achar_anukram:4} ({mulya})");
     }
 
     pub fn disassemble(&self, name: &str) {
-        println!("== BEGIN {} ==", name);
+        println!("== BEGIN {name} ==");
         for (offset, op) in self.vastu.code.iter().enumerate() {
             self.op(op, offset);
         }
-        println!("== END {} ==", name);
+        println!("== END {name} ==");
         println!();
     }
 
     fn invoke_aadesh(&self, op: &str, achar_anukram: u8, args: u8) {
         let mulya = self.vastu.achar[achar_anukram as usize];
-        println!("{:<16} {:4} ({}) {}", op, achar_anukram, mulya, args);
+        println!("{op:<16} {achar_anukram:4} ({mulya}) {args}");
     }
 
     fn jump_aadesh(&self, op: &str, offset: u16) {
-        println!("{:<16} {:4}", op, offset);
+        println!("{op:<16} {offset:4}");
     }
 
     pub fn new(vastu: &'vm Vastu, rashi: Option<&'vm [Mulya]>) -> Self {
@@ -42,12 +42,12 @@ impl<'vm> Disassembler<'vm> {
 
     pub fn op(&self, op: &Aadesh, offset: usize) {
         self.rashi();
-        print!("{:04} ", offset);
+        print!("{offset:04} ");
         let line = &self.vastu.sthaan[offset];
         if offset > 0 && line == &self.vastu.sthaan[offset - 1] {
             print!("   | ");
         } else {
-            print!("{:>4} ", line);
+            print!("{line:>4} ");
         }
         match op {
             Aadesh::Vidhi(c) => self.const_aadesh("Vidhi", *c),
@@ -98,14 +98,14 @@ impl<'vm> Disassembler<'vm> {
     }
 
     fn slot_aadesh(&self, op: &str, slot: u8) {
-        println!("{:<16} {:4}", op, slot);
+        println!("{op:<16} {slot:4}");
     }
 
     fn rashi(&self) {
         if let Some(rashi) = self.rashi {
             println!(" S: ");
             for &mulya in rashi.iter() {
-                println!("\t[{}]", mulya);
+                println!("\t[{mulya}]");
             }
             println!();
         }

core/src/dosa_nirupaka.rs

@@ -9,7 +9,7 @@ pub struct Sourcecode<'sc> {
 }
 
 impl<'sc> Sourcecode<'sc> {
-    pub fn new(filepath: &'sc str) -> Result<Sourcecode> {
+    pub fn new(filepath: &'sc str) -> Result<Sourcecode<'sc>> {
         // let abs_path = fs::canonicalize(filepath)?;
         let path = Path::new(filepath);
         let code = fs::read_to_string(path)?;

core/src/fetchsource.rs

@@ -680,7 +680,7 @@ impl<'p> Parser<'p> {
                 self.expression();
                 self.emit(Aadesh::SetItem);
             } else {
-                self.dosa("अमान्यं नियोजन​ लक्ष्यम्"); // Invalid niyojana target
+                self.dosa("अमान्यं नियोजन\u{200B} लक्ष्यम्"); // Invalid niyojana target
             }
         }
     }

core/src/parser.rs

@@ -259,7 +259,7 @@ impl Iterator for IterSmrti {
     type Item = (GcRef<Vakya>, Mulya);
 
     fn next(&mut self) -> Option<Self::Item> {
-        while self.ptr as *const Pravisti != self.end {
+        while !std::ptr::eq(self.ptr, self.end) {
             unsafe {
                 let pravisti = self.ptr;
                 self.ptr = self.ptr.offset(1);