Merge pull request #267 from moonbitlang/improve-n2-error-message

Improve n2 error message
moonbitlang · Sep 6, 2024 · f1db3a2 · f1db3a2
2 parents db845e3 + c346c54
commit f1db3a2
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/moon/tests/test_cases/mod.rs b/crates/moon/tests/test_cases/mod.rs
@@ -6220,11 +6220,13 @@ fn test_failed_to_fill_whole_buffer() {
     check(
         &get_stderr_with_args_and_replace_dir(&dir, ["check"]),
         expect![[r#"
-            error: internal build state error: $ROOT/target/wasm-gc/release/check/check.moon_db
+            error: internal error
 
             Caused by:
-                0: failed to open build database
-                1: failed to fill whole buffer
+                0: failed to open n2 database
+                1: failed to open $ROOT/target/wasm-gc/release/check/check.moon_db
+                2: failed to read
+                3: failed to fill whole buffer
         "#]],
     );
 }
diff --git a/crates/moonbuild/src/fmt.rs b/crates/moonbuild/src/fmt.rs
@@ -215,8 +215,7 @@ pub fn gen_n2_fmt_state(
     let mut hashes = n2graph::Hashes::default();
     let n2_db_path = &moonbuild_opt.target_dir.join("format.db");
     let db = n2::db::open(n2_db_path, &mut graph, &mut hashes).map_err(|e| N2Error {
-        path: n2_db_path.to_path_buf(),
-        source: N2ErrorKind::OpenDataBaseError(e),
+        source: N2ErrorKind::DBOpenError(e),
     })?;
 
     Ok(State {
@@ -314,8 +313,7 @@ pub fn gen_n2_fmt_check_state(
     let mut hashes = n2graph::Hashes::default();
     let n2_db_path = &moonbuild_opt.target_dir.join("format.db");
     let db = n2::db::open(n2_db_path, &mut graph, &mut hashes).map_err(|e| N2Error {
-        path: n2_db_path.to_path_buf(),
-        source: N2ErrorKind::OpenDataBaseError(e),
+        source: N2ErrorKind::DBOpenError(e),
     })?;
 
     Ok(State {

diff --git a/crates/moonbuild/src/gen/gen_build.rs b/crates/moonbuild/src/gen/gen_build.rs
@@ -446,8 +446,7 @@ pub fn gen_n2_build_state(
     let mut hashes = n2graph::Hashes::default();
     let n2_db_path = &target_dir.join("build.moon_db");
     let db = n2::db::open(n2_db_path, &mut graph, &mut hashes).map_err(|e| N2Error {
-        path: n2_db_path.to_path_buf(),
-        source: N2ErrorKind::OpenDataBaseError(e),
+        source: N2ErrorKind::DBOpenError(e),
     })?;
 
     Ok(State {

diff --git a/crates/moonbuild/src/gen/gen_bundle.rs b/crates/moonbuild/src/gen/gen_bundle.rs
@@ -309,8 +309,7 @@ pub fn gen_n2_bundle_state(
     let mut hashes = n2graph::Hashes::default();
     let n2_db_path = &target_dir.join("build.moon_db");
     let db = n2::db::open(n2_db_path, &mut graph, &mut hashes).map_err(|e| N2Error {
-        path: n2_db_path.to_path_buf(),
-        source: N2ErrorKind::OpenDataBaseError(e),
+        source: N2ErrorKind::DBOpenError(e),
     })?;
 
     Ok(State {

diff --git a/crates/moonbuild/src/gen/gen_check.rs b/crates/moonbuild/src/gen/gen_check.rs
@@ -370,8 +370,7 @@ pub fn gen_n2_check_state(
     let mut hashes = n2graph::Hashes::default();
     let n2_db_path = &target_dir.join("check.moon_db");
     let db = n2::db::open(n2_db_path, &mut graph, &mut hashes).map_err(|e| N2Error {
-        path: n2_db_path.to_path_buf(),
-        source: N2ErrorKind::OpenDataBaseError(e),
+        source: N2ErrorKind::DBOpenError(e),
     })?;
 
     let default = graph.get_start_nodes();

diff --git a/crates/moonbuild/src/gen/gen_runtest.rs b/crates/moonbuild/src/gen/gen_runtest.rs
@@ -920,8 +920,7 @@ pub fn gen_n2_runtest_state(
     let mut hashes = n2graph::Hashes::default();
     let n2_db_path = &moonbuild_opt.target_dir.join("build.moon_db");
     let db = n2::db::open(n2_db_path, &mut graph, &mut hashes).map_err(|e| N2Error {
-        path: n2_db_path.to_path_buf(),
-        source: N2ErrorKind::OpenDataBaseError(e),
+        source: N2ErrorKind::DBOpenError(e),
     })?;
 
     Ok(State {

diff --git a/crates/moonbuild/src/gen/n2_errors.rs b/crates/moonbuild/src/gen/n2_errors.rs
@@ -16,18 +16,15 @@
 //
 // For inquiries, you can contact us via e-mail at jichuruanjian@idea.edu.cn.
 
-use std::path::PathBuf;
-
 #[derive(Debug, thiserror::Error)]
-#[error("internal build state error: {path}")]
+#[error("internal error")]
 pub struct N2Error {
-    pub path: PathBuf,
     #[source]
     pub(crate) source: N2ErrorKind,
 }
 
 #[derive(Debug, thiserror::Error)]
 pub enum N2ErrorKind {
-    #[error("failed to open build database")]
-    OpenDataBaseError(#[from] anyhow::Error),
+    #[error("failed to open n2 database")]
+    DBOpenError(#[from] n2::db::OpenError),
 }