Update broken dependecies

Author: Kmeakin

Cargo.lock

@@ -3,6 +3,7 @@ inherits = "release"
 debug = true
 
 [workspace]
+resolver = "2"
 members = [
     './fathom',
 ]

Cargo.toml

@@ -1,20 +1,20 @@
 [package]
-name = "fathom"
-version = "0.1.0"
-authors = ["YesLogic Pty. Ltd. <[email protected]>"]
-repository = "https://github.com/yeslogic/fathom"
-edition = "2021"
+name         = "fathom"
+version      = "0.1.0"
+authors      = ["YesLogic Pty. Ltd. <[email protected]>"]
+repository   = "https://github.com/yeslogic/fathom"
+edition      = "2021"
 rust-version = "1.67.0"
-publish = false
+publish      = false
 
 description = "A language for declaratively specifying binary data formats"
-readme = "../README.md"
-license = "Apache-2.0"
+readme      = "../README.md"
+license     = "Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [[test]]
-name = "source_tests"
+name    = "source_tests"
 harness = false
 
 [dependencies]
@@ -23,25 +23,29 @@ clap = { version = "4.0", features = ["derive"] }
 codespan-reporting = "0.11.1"
 fxhash = "0.2"
 itertools = "0.10"
-lalrpop-util = "0.19.5"
-lasso = { version = "0.6.0", features = ["multi-threaded", "ahasher", "inline-more"] }
+lalrpop-util = "0.20.0"
 levenshtein = "1.0.5"
 logos = "0.12"
+lasso = { version = "0.6.0", features = [
+    "multi-threaded",
+    "ahasher",
+    "inline-more",
+] }
 once_cell = { version = "1.17.0", features = ["parking_lot"] }
 pretty = "0.11.2"
 rpds = "0.12.0"
 scoped-arena = "0.4.1"
 termsize = "0.1.6"
 
 [build-dependencies]
-lalrpop = { git = "https://github.com/kmeakin/lalrpop", branch = "raw-identifiers" }
+lalrpop = "0.20.0"
 
 [dev-dependencies]
-diff = "0.1.12"
-globwalk = "0.8"
-itertools = "0.10.1"
+diff          = "0.1.12"
+globwalk      = "0.8"
+itertools     = "0.10.1"
 libtest-mimic = "0.6.0"
-serde = { version = "1.0", features = ["derive"] }
-toml = "0.5"
-trycmd = "0.14.10"
-walkdir = "2.3.2"
+serde         = { version = "1.0", features = ["derive"] }
+toml          = "0.5"
+trycmd        = "0.14.10"
+walkdir       = "2.3.2"

fathom/Cargo.toml

@@ -440,7 +440,7 @@ impl ParseMessage {
             LalrpopParseError::InvalidToken { location } => ParseMessage::InvalidToken {
                 range: ByteRange::new(location, location),
             },
-            LalrpopParseError::UnrecognizedEOF { location, expected } => {
+            LalrpopParseError::UnrecognizedEof { location, expected } => {
                 ParseMessage::UnrecognizedEof {
                     range: ByteRange::new(location, location),
                     expected, // TODO: convert to descriptions?

fathom/src/surface.rs

@@ -17,7 +17,7 @@ Options:
       --module <MODULE_FILE>  Path to a module to load when reading
       --format <FORMAT>       Format used when reading the binary data [default: main]
       --allow-errors          Continue even if errors were encountered
-  -h, --help                  Print help information (use `--help` for more detail)
+  -h, --help                  Print help (see more with '--help')
 
 Examples:
 
@@ -56,7 +56,7 @@ Options:
           Continue even if errors were encountered
 
   -h, --help
-          Print help information (use `-h` for a summary)
+          Print help (see a summary with '-h')
 
 Binary data can be read using a term supplied by the `--format` option:
 
@@ -181,13 +181,13 @@ Arguments must be provided to `fathom data`
 ```console
 $ fathom data
 ? failed
-error: The following required arguments were not provided:
+error: the following required arguments were not provided:
   --format <FORMAT>
   <BINARY_FILE>
 
 Usage: fathom data --format <FORMAT> <BINARY_FILE>
 
-For more information try '--help'
+For more information, try '--help'.
 
 ```
 
@@ -196,12 +196,12 @@ The `--format` option must be present when `--module` is not supplied
 ```console
 $ fathom data formats/data/edid/dell-P2415Q.edid
 ? failed
-error: The following required arguments were not provided:
+error: the following required arguments were not provided:
   --format <FORMAT>
 
 Usage: fathom data --format <FORMAT> <BINARY_FILE>
 
-For more information try '--help'
+For more information, try '--help'.
 
 ```
 

tests/cmd/fathom-data.md

@@ -15,7 +15,7 @@ Options:
       --term <TERM_FILE>      Path to a term to elaborate
       --allow-errors          Continue even if errors were encountered
       --pretty-core           Pretty print core module
-  -h, --help                  Print help information
+  -h, --help                  Print help
 
 ```
 
@@ -32,7 +32,7 @@ Options:
       --term <TERM_FILE>      Path to a term to elaborate
       --allow-errors          Continue even if errors were encountered
       --pretty-core           Pretty print core module
-  -h, --help                  Print help information
+  -h, --help                  Print help
 
 ```
 
@@ -72,13 +72,13 @@ Either a `--module` or a `--term` must be provided
 ```console
 $ fathom elab
 ? failed
-error: The following required arguments were not provided:
+error: the following required arguments were not provided:
   --module <MODULE_FILE>
   --term <TERM_FILE>
 
 Usage: fathom elab --module <MODULE_FILE> --term <TERM_FILE>
 
-For more information try '--help'
+For more information, try '--help'.
 
 ```
 
@@ -90,11 +90,11 @@ The `--module` and `--term` inputs conflict with each other
 $ fathom elab --module formats/object-id.fathom
 >             --term tests/succeed/record-type/pair-dependent.fathom
 ? failed
-error: The argument '--module <MODULE_FILE>' cannot be used with '--term <TERM_FILE>'
+error: the argument '--module <MODULE_FILE>' cannot be used with '--term <TERM_FILE>'
 
 Usage: fathom elab --module <MODULE_FILE>
 
-For more information try '--help'
+For more information, try '--help'.
 
 ```
 

tests/cmd/fathom-elab.md

@@ -13,7 +13,7 @@ Usage: fathom norm [OPTIONS] --term <TERM_FILE>
 Options:
       --term <TERM_FILE>  Path to a term to normalize
       --allow-errors      Continue even if errors were encountered
-  -h, --help              Print help information
+  -h, --help              Print help
 
 ```
 
@@ -28,7 +28,7 @@ Usage: fathom norm [OPTIONS] --term <TERM_FILE>
 Options:
       --term <TERM_FILE>  Path to a term to normalize
       --allow-errors      Continue even if errors were encountered
-  -h, --help              Print help information
+  -h, --help              Print help
 
 ```
 
@@ -53,12 +53,12 @@ At least a `--term` must be provided
 ```console
 $ fathom norm
 ? failed
-error: The following required arguments were not provided:
+error: the following required arguments were not provided:
   --term <TERM_FILE>
 
 Usage: fathom norm --term <TERM_FILE>
 
-For more information try '--help'
+For more information, try '--help'.
 
 ```
 

tests/cmd/fathom-norm.md

@@ -17,8 +17,8 @@ Commands:
   help  Print this message or the help of the given subcommand(s)
 
 Options:
-  -h, --help     Print help information
-  -V, --version  Print version information
+  -h, --help     Print help
+  -V, --version  Print version
 
 ```
 
@@ -37,8 +37,8 @@ Commands:
   help  Print this message or the help of the given subcommand(s)
 
 Options:
-  -h, --help     Print help information
-  -V, --version  Print version information
+  -h, --help     Print help
+  -V, --version  Print version
 
 ```
 
@@ -60,7 +60,7 @@ Commands:
   help  Print this message or the help of the given subcommand(s)
 
 Options:
-  -h, --help     Print help information
-  -V, --version  Print version information
+  -h, --help     Print help
+  -V, --version  Print version
 
 ```