Tidy cody

- Rename tokens field on SyntacticMacroDefinition to body
- Rename push_err! macro to err!
- Create macros for character-matching logic in syntactic parsing
- Replace .as_bytes().to_vec() pattern with .into_bytes()

1 files changed, 2 insertions, 2 deletions

diff --git a/src/bin/tq.rs b/src/bin/tq.rs
index d1e51f3..ca8fc69 100644
--- a/src/bin/tq.rs
+++ b/src/bin/tq.rs
@@ -32,7 +32,7 @@ fn main() {
     let no_libs         = args.get("no-libs").as_bool();
     let no_project_libs = args.get("no-project-libs").as_bool();
     let no_env_libs     = args.get("no-env-libs").as_bool();
-    let format          = Format::from_str(&args.get("format").as_string());
+    let format          = Format::from_str(args.get("format").as_str());
     let width           = args.get("width").as_u32_opt();
     let dry_run         = args.get("dry-run").as_bool();
     let print_tree      = args.get("tree").as_bool();
@@ -188,7 +188,7 @@ Created by Ben Bridle.
             Format::Inhx => format_inhx(&segments),
             Format::Inhx32 => format_inhx32(&segments),
             Format::Raw => format_raw(&segments, width),
-            Format::Source => unreachable!("Source output is handled before merged assembly"),
+            Format::Source => unreachable!("Source output is handled before full assembly"),
         };
         match result {
             Ok(bytes) => write_bytes_and_exit(&bytes, destination.as_ref()),