added endlines to some ast elements

Author: mendelsshop

.github/workflows/msrv.yml

@@ -0,0 +1,30 @@
+name: msrv-badge
+
+on:
+  pull_request:
+  push:
+  workflow_dispatch:
+
+jobs:
+  create-msrv-badge:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: spenserblack/[email protected]
+        id: get-msrv
+        with:
+          set: true
+      - name: Create Badge
+        run: curl https://img.shields.io/badge/minimum%20rust%20version-${{ steps.get-msrv.outputs.msrv }}-blue > resources/msrv.svg
+      - name: Commit Badge
+        # If there are no changes to the badge this would error out. But it
+        # isn't a problem if there were no changes, so errors are allowed.
+        continue-on-error: true
+        run: |
+          git add resources/msrv.svg
+          git add Cargo.toml
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git commit -m "Update MSRV badge [Skip CI]"
+          git push

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "umpl"
-version = "1.0.2"
+version = "1.1.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/mendelsshop/umpl"
@@ -13,6 +13,6 @@ description = "Umpl is a a meme language that is a mix of c like languages and l
 [dependencies]
 unic-emoji-char = "0.9.0"
 hexponent = "0.3.1"
-log4rs = "1.1.1"
+simple_file_logger = "0.3.1"
 log = "0.4.17"
 lazy_static = "1.4.0"

README.md

@@ -1,5 +1,5 @@
 
-# [![cargo clippy](https://github.com/mendelsshop/UMPL/actions/workflows/cargo_clippy.yml/badge.svg)](https://github.com/mendelsshop/UMPL/actions/workflows/cargo_clippy.yml) [![crates.io](https://img.shields.io/crates/v/umpl.svg?label=latest%20version)](https://crates.io/crates/umpl) [![Crates.io](https://img.shields.io/crates/d/umpl?label=crates.io%20downloads)](https://crates.io/crates/umpl)
+# [![cargo clippy](https://github.com/mendelsshop/UMPL/actions/workflows/cargo_clippy.yml/badge.svg)](https://github.com/mendelsshop/UMPL/actions/workflows/cargo_clippy.yml) [![crates.io](https://img.shields.io/crates/v/umpl.svg?label=latest%20version)](https://crates.io/crates/umpl) [![Crates.io](https://img.shields.io/crates/d/umpl?label=crates.io%20downloads)](https://crates.io/crates/umpl) ![msrv](./resources/msrv.svg) [![](https://tokei.rs/b1/github/mendelsshop/UMPL?category=lines)](https://github.com/mendelsshop/UMPL) [![license](https://img.shields.io/github/license/mendelsshop/UMPL)](https://github.com/mendelsshop/UMPL/blob/main/LICENSE)
 
 # UMPL
 

log.yaml

@@ -3,7 +3,7 @@ use std::process::exit;
 use crate::error;
 pub static mut EASY_MODE: bool = false;
 pub static mut TOGGLE_CASE: i32 = 0;
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub struct ParsedArgs {
     pub repl: bool,   // inerative mode
     pub file: String, // file to read/write
@@ -23,24 +23,24 @@ impl ParsedArgs {
 }
 
 pub fn get_string_args(args: &[String]) -> (usize, ParsedArgs) {
-    let mut to_return: ParsedArgs = ParsedArgs::new(false, String::from(""));
+    let mut to_return: ParsedArgs = ParsedArgs::new(false, String::new());
     let mut index: usize = 1; // start at 1 because index  0 is the program name
     if args.len() < 2 {
         // if there are no arguments run in repl mode with no file
-        return (0, ParsedArgs::new(true, String::from("")));
+        return (0, ParsedArgs::new(true, String::new()));
     } else if args[1].ends_with(".umpl") {
         // make sure it's a .umpl file
         to_return.file = args[1].to_string(); // if it is, then set file to the file name
         to_return.repl = false; // and set repl to false
         index += 1; // and increment index
         let file_len = to_return.file.strip_suffix(".umpl").unwrap().len(); // get the length of the file name without the .umpl
-        if args.len() > 2 && args[2] == format!("{}", file_len) {
+        if args.len() > 2 && args[2] == format!("{file_len}") {
             unsafe {
                 EASY_MODE = true;
             }
             index += 1; // and increment index
         } else if args.len() > 2 && args[2] == "show_length" {
-            println!("{}", file_len); // print the length of the file name without the .umpl
+            println!("{file_len}"); // print the length of the file name without the .umpl
             exit(1);
         }
     } else {
@@ -80,13 +80,10 @@ pub fn get_dash_args(args: &[String], start_index: usize, args_struct: &mut Pars
                     };
                     unsafe { TOGGLE_CASE = num as i32 };
                 } else if char_part_arg == 't' {
-                    let number: i32 = match arg.split_once('=') {
-                        Some(n) => match n.1.parse() {
-                            Ok(value) => value,
-                            Err(error) => error::error(0, error),
-                        },
-                        _ => error::error(0, "option t requires an =number"),
-                    };
+                    let number: i32 = arg.split_once('=').map_or_else(|| error::error(0, "option t requires an =number"), |n| match n.1.parse() {
+                        Ok(value) => value,
+                        Err(error) => error::error(0, error),
+                    });
                     unsafe {
                         TOGGLE_CASE = number;
                     }

resources/msrv.svg

@@ -14,7 +14,7 @@ pub fn error<T: Display>(line: i32, message: T) -> ! {
     if message.is_empty() {
         message = "Segmentation fault (core dumped)";
     }
-    eprintln!("[line: {}], Error{}: {}", line, where_, message);
+    eprintln!("[line: {line}], Error{where_}: {message}");
     exit(1);
 }
 
@@ -30,13 +30,13 @@ pub fn arg_error<T: Display>(
         if num_args < given_args {
             error(
                 line,
-                format!("{} requires at least {} arguments", function, num_args),
+                format!("{function} requires at least {num_args} arguments"),
             );
         }
     } else if num_args != given_args {
         error(
             line,
-            format!("{} requires {} arguments", function, num_args),
+            format!("{function} requires {num_args} arguments"),
         );
     }
 }