Remove dependency on tryvial

tweag · Aug 29, 2023 · 2401de2 · 2401de2
1 parent 9d88566
commit 2401de2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -67,7 +67,6 @@ tree-sitter-ocamllex = "0.20.2"
 tree-sitter-query = { git = "https://github.com/nvim-treesitter/tree-sitter-query" }
 tree-sitter-rust = "0.20.3"
 tree-sitter-toml = "0.20.0"
-tryvial = "0.2.0"
 unescape = "0.1"
 wasm-bindgen = "0.2.84"
 wasm-bindgen-futures = "0.4.34"

diff --git a/topiary-cli/Cargo.toml b/topiary-cli/Cargo.toml
@@ -40,7 +40,6 @@ tokio = { workspace = true, features = ["fs", "rt-multi-thread", "sync", "macros
 toml = { workspace = true }
 topiary = { path = "../topiary" }
 tree-sitter-facade = { workspace = true }
-tryvial = { workspace = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }

diff --git a/topiary-cli/src/main.rs b/topiary-cli/src/main.rs
@@ -63,34 +63,30 @@ async fn run() -> CLIResult<()> {
                                     Err(error) => return Err(error),
                                 };
 
-                                tryvial::try_block! {
-                                    let output = OutputFile::try_from(&input)?;
-
-                                    log::info!(
-                                        "Formatting {}, as {} using {}, to {}",
-                                        input.source(),
-                                        input.language(),
-                                        input.query().to_string_lossy(),
-                                        output
-                                    );
-
-                                    let mut buf_input = BufReader::new(input);
-                                    let mut buf_output = BufWriter::new(output);
-
-                                    formatter(
-                                        &mut buf_input,
-                                        &mut buf_output,
-                                        &lang_def.query,
-                                        &lang_def.language,
-                                        &lang_def.grammar,
-                                        Operation::Format {
-                                            skip_idempotence,
-                                            tolerate_parsing_errors,
-                                        },
-                                    )?;
-
-                                    buf_output.into_inner()?.persist()?;
-                                }
+                                let output = OutputFile::try_from(&input)?;
+                                log::info!(
+                                    "Formatting {}, as {} using {}, to {}",
+                                    input.source(),
+                                    input.language(),
+                                    input.query().to_string_lossy(),
+                                    output
+                                );
+                                let mut buf_input = BufReader::new(input);
+                                let mut buf_output = BufWriter::new(output);
+                                formatter(
+                                    &mut buf_input,
+                                    &mut buf_output,
+                                    &lang_def.query,
+                                    &lang_def.language,
+                                    &lang_def.grammar,
+                                    Operation::Format {
+                                        skip_idempotence,
+                                        tolerate_parsing_errors,
+                                    },
+                                )?;
+                                buf_output.into_inner()?.persist()?;
+
+                                Ok(())
                             }
 
                             // This happens when the input resolver cannot establish an input