[CLI] upgrade error formatting should use existing diag wrapper

crates/sui/Cargo.toml

@@ -94,9 +94,11 @@ move-analyzer.workspace = true
 move-bytecode-verifier-meter.workspace = true
 move-core-types.workspace = true
 move-package.workspace = true
+move-compiler.workspace = true
 csv.workspace = true
 move-vm-profiler.workspace = true
 move-vm-config.workspace = true
+move-ir-types.workspace = true
 move-command-line-common.workspace = true
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]

crates/sui/src/unit_tests/fixtures/upgrade_errors/declarations_missing_v1/sources/enum.move

@@ -0,0 +1,10 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module upgrades::enum_ {
+    public enum EnumToBeRemoved {
+        A,
+        B
+    }
+}
+

crates/sui/src/unit_tests/fixtures/upgrade_errors/declarations_missing_v1/sources/func.move

@@ -0,0 +1,9 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module upgrades::func_ {
+    public fun fun_to_be_removed(): u64 {
+        0
+    }
+}
+

crates/sui/src/unit_tests/fixtures/upgrade_errors/declarations_missing_v1/sources/struct.move

@@ -0,0 +1,10 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+#[allow(unused_field)]
+module upgrades::struct_ {
+    public struct StructToBeRemoved {
+        b: u64
+    }
+}
+

crates/sui/src/unit_tests/fixtures/upgrade_errors/declarations_missing_v2/sources/enum.move

@@ -0,0 +1,7 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module upgrades::enum_ {
+    //public enum EnumToBeRemoved {}
+}
+

crates/sui/src/unit_tests/fixtures/upgrade_errors/declarations_missing_v2/sources/func.move

@@ -0,0 +1,7 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module upgrades::func_ {
+    // public fun fun_to_be_removed(): u64 {}
+}
+

crates/sui/src/unit_tests/fixtures/upgrade_errors/declarations_missing_v2/sources/struct.move

@@ -0,0 +1,7 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module upgrades::struct_ {
+    // public struct StructToBeRemoved {}
+}
+

crates/sui/src/unit_tests/snapshots/sui__upgrade_compatibility__upgrade_compatibility_tests__declarations_missing.snap

@@ -2,29 +2,35 @@
 source: crates/sui/src/unit_tests/upgrade_compatibility_tests.rs
 expression: normalize_path(err.to_string())
 ---
-error: struct is missing
-  ┌─ /fixtures/upgrade_errors/declarations_missing_v2/sources/UpgradeErrors.move:7:18
+error[Compatibility E01001]: missing public declaration
+  ┌─ /fixtures/upgrade_errors/declarations_missing_v2/sources/enum.move:4:18
   │
-7 │ module upgrades::upgrades {
-  │                  ^^^^^^^^ Module 'upgrades' expected struct 'StructToBeRemoved', but found none
+4 │ module upgrades::enum_ {
+  │                  ^^^^^ enum 'EnumToBeRemoved' is missing
   │
-  = structs are part of a module's public interface and cannot be removed or changed during an upgrade, add back the struct 'StructToBeRemoved'.
+  = enum is missing expected enum 'EnumToBeRemoved', but found none
+  = enums are part of a module's public interface and cannot be removed or changed during an upgrade
+  = add missing enum 'EnumToBeRemoved' back to the module 'enum_'.
 
-error: enum is missing
-  ┌─ /fixtures/upgrade_errors/declarations_missing_v2/sources/UpgradeErrors.move:7:18
+error[Compatibility E01001]: missing public declaration
+  ┌─ /fixtures/upgrade_errors/declarations_missing_v2/sources/func.move:4:18
   │
-7 │ module upgrades::upgrades {
-  │                  ^^^^^^^^ Module 'upgrades' expected enum 'EnumToBeRemoved', but found none
+4 │ module upgrades::func_ {
+  │                  ^^^^^ public function 'fun_to_be_removed' is missing
   │
-  = enums are part of a module's public interface and cannot be removed or changed during an upgrade, add back the enum 'EnumToBeRemoved'.
+  = public function is missing expected public function 'fun_to_be_removed', but found none
+  = public functions are part of a module's public interface and cannot be removed or changed during an upgrade
+  = add missing public function 'fun_to_be_removed' back to the module 'func_'.
 
-error: public function is missing
-  ┌─ /fixtures/upgrade_errors/declarations_missing_v2/sources/UpgradeErrors.move:7:18
+error[Compatibility E01001]: missing public declaration
+  ┌─ /fixtures/upgrade_errors/declarations_missing_v2/sources/struct.move:4:18
   │
-7 │ module upgrades::upgrades {
-  │                  ^^^^^^^^ Module 'upgrades' expected public function 'fun_to_be_removed', but found none
+4 │ module upgrades::struct_ {
+  │                  ^^^^^^^ struct 'StructToBeRemoved' is missing
   │
-  = public functions are part of a module's public interface and cannot be removed or changed during an upgrade, add back the public function 'fun_to_be_removed'.
+  = struct is missing expected struct 'StructToBeRemoved', but found none
+  = structs are part of a module's public interface and cannot be removed or changed during an upgrade
+  = add missing struct 'StructToBeRemoved' back to the module 'struct_'.
 
 
 Upgrade failed, this package requires changes to be compatible with the existing package. Its upgrade policy is set to 'Compatible'.