From cb8ab35ca7d2a94706584361694aa08988f88d9c Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 15:38:46 -0800 Subject: [PATCH 01/10] rust changes --- .../move-command-line-common/src/testing.rs | 67 ++++++++----------- .../crates/move-package/tests/test_runner.rs | 47 ++++--------- 2 files changed, 42 insertions(+), 72 deletions(-) diff --git a/external-crates/move/crates/move-command-line-common/src/testing.rs b/external-crates/move/crates/move-command-line-common/src/testing.rs index bf84fa18517e5..4acb1d9f98dc1 100644 --- a/external-crates/move/crates/move-command-line-common/src/testing.rs +++ b/external-crates/move/crates/move-command-line-common/src/testing.rs @@ -65,28 +65,37 @@ pub fn format_diff(expected: impl AsRef, actual: impl AsRef) -> String } /// See `insta_assert!` for documentation. -pub struct InstaOptions> { - pub info: Option, - pub suffix: Option, +pub struct InstaOptions { + info_set: bool, + suffix_set: bool, + settings: insta::Settings, } -impl> InstaOptions { +impl InstaOptions { /// See `insta_assert!` for documentation. pub fn new() -> Self { Self { - info: None, - suffix: None, + info_set: false, + suffix_set: false, + settings: insta::Settings::clone_current(), } } -} -impl InstaOptions<(), String> { - /// See `insta_assert!` for documentation. - pub fn none() -> Self { - Self { - info: None, - suffix: None, - } + pub fn info(&mut self, info: Info) { + assert!(!self.info_set); + self.settings.set_info(&info); + self.info_set = true; + } + + pub fn suffix>(&mut self, suffix: Suffix) { + assert!(!self.suffix_set); + self.settings.set_snapshot_suffix(suffix); + self.suffix_set = true; + } + + #[doc(hidden)] + pub fn into_settings(self) -> insta::Settings { + self.settings } } @@ -145,44 +154,24 @@ macro_rules! insta_assert { let name: String = $name.into(); let i: &std::path::Path = $input.as_ref(); let c = $contents; - let $crate::testing::InstaOptions { info, suffix } = $options; - let mut settings = $crate::testing::insta::Settings::clone_current(); - let output = settings.set_snapshot_path( i.canonicalize().unwrap().parent().unwrap()); - if let Some(info) = info { - settings.set_info(&info); - } - if let Some(suffix) = suffix { - settings.set_snapshot_suffix(suffix); - } + let mut settings = $options.into_settings(); + settings.set_snapshot_path(i.parent().unwrap()); settings.set_prepend_module_to_snapshot(false); settings.set_omit_expression(true); settings.bind(|| { $crate::testing::insta::assert_snapshot!(name, c); }); }}; - { - name: $name:expr, - input_path: $input:expr, - contents: $contents:expr - $(,)? - } => {{ - insta_assert! { - name: $name, - input_path: $input, - contents: $contents, - options: $crate::testing::InstaOptions::none(), - } - }}; { name: $name:expr, input_path: $input:expr, contents: $contents:expr, - $($k:ident: $v:expr),+$(,)? + $($k:ident: $v:expr),*$(,)? } => {{ let mut opts = $crate::testing::InstaOptions::new(); $( - opts.$k = Some($v); - )+ + opts.$k($v); + )* insta_assert! { name: $name, input_path: $input, diff --git a/external-crates/move/crates/move-package/tests/test_runner.rs b/external-crates/move/crates/move-package/tests/test_runner.rs index e87d842c2fd11..91858e759d460 100644 --- a/external-crates/move/crates/move-package/tests/test_runner.rs +++ b/external-crates/move/crates/move-package/tests/test_runner.rs @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 use anyhow::{anyhow, bail}; -use move_command_line_common::testing::{ - add_update_baseline_fix, format_diff, read_env_update_baseline, -}; +use move_command_line_common::testing::insta_assert; use move_package::{ compilation::{build_plan::BuildPlan, compiled_package::CompiledPackageInfo}, package_hooks, @@ -17,7 +15,6 @@ use move_package::{ }; use move_symbol_pool::Symbol; use std::{ - ffi::OsStr, fs, path::{Path, PathBuf}, }; @@ -54,23 +51,25 @@ pub fn run_test(path: &Path) -> datatest_stable::Result<()> { } struct Test<'a> { + test_name: String, + kind: &'static str, toml_path: &'a Path, - expected: PathBuf, output_dir: TempDir, } impl Test<'_> { fn from_path_with_kind<'p>( toml_path: &'p Path, - kind: &str, + kind: &'static str, ) -> datatest_stable::Result>> { let expected = toml_path.with_extension(kind); if !expected.is_file() { Ok(None) } else { Ok(Some(Test { + test_name: toml_path.file_stem().unwrap().to_string_lossy().to_string(), toml_path, - expected, + kind, output_dir: tempdir()?, })) } @@ -78,36 +77,18 @@ impl Test<'_> { fn run(&self) -> datatest_stable::Result<()> { package_hooks::register_package_hooks(Box::new(TestHooks())); - let update_baseline = read_env_update_baseline(); - let output = self.output().unwrap_or_else(|err| format!("{:#}\n", err)); - - if update_baseline { - fs::write(&self.expected, &output)?; - return Ok(()); - } - - let expected = fs::read_to_string(&self.expected)?; - if expected != output { - return Err(anyhow!(add_update_baseline_fix(format!( - "Expected outputs differ for {:?}:\n{}", - self.expected, - format_diff(expected, output), - ))) - .into()); - } + insta_assert! { + name: self.test_name, + input_path: self.toml_path, + contents: output, + suffix: self.kind, + }; Ok(()) } fn output(&self) -> anyhow::Result { - let Some(ext) = self.expected.extension().and_then(OsStr::to_str) else { - bail!( - "Unexpected snapshot file extension: {:?}", - self.expected.extension() - ); - }; - let out_path = self.output_dir.path().to_path_buf(); let lock_path = out_path.join("Move.lock"); @@ -118,7 +99,7 @@ impl Test<'_> { install_dir: Some(out_path), force_recompilation: false, lock_file: ["locked", "notlocked"] - .contains(&ext) + .contains(&self.kind) .then(|| lock_path.clone()), ..Default::default() }; @@ -127,7 +108,7 @@ impl Test<'_> { let resolved_package = config.resolution_graph_for_package(self.toml_path, None, &mut progress); - Ok(match ext { + Ok(match self.kind { "progress" => String::from_utf8(progress)?, "locked" => fs::read_to_string(&lock_path)?, From 87fb0a2dcbd39bd343ddbd25c91b4bc433c8a0fe Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 15:49:00 -0800 Subject: [PATCH 02/10] rename files --- .../basic_no_deps/{Move.compiled => Move@compiled.snap} | 0 .../test_sources/basic_no_deps/{Move.locked => Move@locked.snap} | 0 .../basic_no_deps/{Move.resolved => Move@resolved.snap} | 0 .../{Move.compiled => Move@compiled.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.compiled => Move@compiled.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../basic_no_deps_test_mode/{Move.compiled => Move@compiled.snap} | 0 .../case_insensitive_check/{Move.compiled => Move@compiled.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../dep_dev_dep_diamond/{Move.locked => Move@locked.snap} | 0 .../dep_dev_dep_diamond/{Move.resolved => Move@resolved.snap} | 0 .../dep_good_digest/{Move.locked => Move@locked.snap} | 0 .../dep_good_digest/{Move.resolved => Move@resolved.snap} | 0 .../{Move.compiled => Move@compiled.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.compiled => Move@compiled.snap} | 0 .../diamond_problem_no_conflict/{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../direct_and_indirect_dep/{Move.locked => Move@locked.snap} | 0 .../direct_and_indirect_dep/{Move.resolved => Move@resolved.snap} | 0 .../direct_cyclic_dep/{Move.notlocked => Move@notlocked.snap} | 0 .../direct_cyclic_dep/{Move.resolved => Move@resolved.snap} | 0 .../tests/test_sources/external/{Move.locked => Move@locked.snap} | 0 .../test_sources/external/{Move.progress => Move@progress.snap} | 0 .../test_sources/external/{Move.resolved => Move@resolved.snap} | 0 .../external_bad_dep/{Move.locked => Move@locked.snap} | 0 .../external_bad_dep/{Move.resolved => Move@resolved.snap} | 0 .../external_broken/{Move.notlocked => Move@notlocked.snap} | 0 .../external_broken/{Move.resolved => Move@resolved.snap} | 0 .../external_dev_dep/{Move.locked => Move@locked.snap} | 0 .../external_dev_dep/{Move.progress => Move@progress.snap} | 0 .../external_dev_dep/{Move.resolved => Move@resolved.snap} | 0 .../external_failing/{Move.notlocked => Move@notlocked.snap} | 0 .../external_failing/{Move.progress => Move@progress.snap} | 0 .../external_failing/{Move.resolved => Move@resolved.snap} | 0 .../external_no_resolver/{Move.notlocked => Move@notlocked.snap} | 0 .../external_no_resolver/{Move.resolved => Move@resolved.snap} | 0 .../external_overlap/{Move.locked => Move@locked.snap} | 0 .../external_overlap/{Move.resolved => Move@resolved.snap} | 0 .../external_overlap_fail/{Move.notlocked => Move@notlocked.snap} | 0 .../external_overlap_fail/{Move.resolved => Move@resolved.snap} | 0 .../{Move.notlocked => Move@notlocked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.progress => Move@progress.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../external_resolver_config/{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../external_silent/{Move.locked => Move@locked.snap} | 0 .../external_silent/{Move.progress => Move@progress.snap} | 0 .../longer_cyclic_dep/{Move.notlocked => Move@notlocked.snap} | 0 .../longer_cyclic_dep/{Move.resolved => Move@resolved.snap} | 0 .../multiple_deps_from_lock/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../multiple_deps_no_rename/{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../multiple_deps_rename/{Move.resolved => Move@resolved.snap} | 0 .../{Move.compiled => Move@compiled.snap} | 0 .../{Move.notlocked => Move@notlocked.snap} | 0 .../nested_deps_bad_parent/{Move.resolved => Move@resolved.snap} | 0 .../nested_deps_git_local/{Move.locked => Move@locked.snap} | 0 .../nested_deps_git_local/{Move.resolved => Move@resolved.snap} | 0 .../nested_deps_local_local/{Move.locked => Move@locked.snap} | 0 .../nested_deps_override/{Move.locked => Move@locked.snap} | 0 .../nested_deps_shared_override/{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../nested_pruned_override/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../test_sources/one_dep/{Move.compiled => Move@compiled.snap} | 0 .../tests/test_sources/one_dep/{Move.locked => Move@locked.snap} | 0 .../test_sources/one_dep/{Move.resolved => Move@resolved.snap} | 0 .../{Move.compiled => Move@compiled.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../one_dep_bad_digest/{Move.locked => Move@locked.snap} | 0 .../one_dep_bad_digest/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../one_dep_override/{Move.compiled => Move@compiled.snap} | 0 .../one_dep_override/{Move.locked => Move@locked.snap} | 0 .../one_dep_override/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../one_dep_renamed/{Move.compiled => Move@compiled.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../one_dep_with_scripts/{Move.compiled => Move@compiled.snap} | 0 .../one_dep_wrong_name/{Move.resolved => Move@resolved.snap} | 0 .../package_hooks/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../parsing_edition_2024/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../parsing_edition_legacy/{Move.resolved => Move@resolved.snap} | 0 .../parsing_edition_unknown/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../parsing_flavor_sui/{Move.resolved => Move@resolved.snap} | 0 .../parsing_flavor_unknown/{Move.resolved => Move@resolved.snap} | 0 .../parsing_full_manifest/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../parsing_invalid_author/{Move.resolved => Move@resolved.snap} | 0 .../parsing_invalid_authors/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../resolve_pkg_name/{Move.compiled => Move@compiled.snap} | 0 .../resolve_pkg_name/{Move.locked => Move@locked.snap} | 0 .../resolve_pkg_name/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../resolve_version/{Move.locked => Move@locked.snap} | 0 .../resolve_version/{Move.resolved => Move@resolved.snap} | 0 .../resolve_version_diamond/{Move.locked => Move@locked.snap} | 0 .../resolve_version_diamond/{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../{Move.locked => Move@locked.snap} | 0 .../{Move.resolved => Move@resolved.snap} | 0 .../test_symlinks/{Move.compiled => Move@compiled.snap} | 0 192 files changed, 0 insertions(+), 0 deletions(-) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external/{Move.progress => Move@progress.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_broken/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_broken/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/{Move.progress => Move@progress.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_failing/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_failing/{Move.progress => Move@progress.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_failing/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_overlap/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_overlap/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/{Move.progress => Move@progress.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_silent/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/external_silent/{Move.progress => Move@progress.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/{Move.notlocked => Move@notlocked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_override/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/package_hooks/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/{Move.compiled => Move@compiled.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/{Move.locked => Move@locked.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/{Move.resolved => Move@resolved.snap} (100%) rename external-crates/move/crates/move-package/tests/test_sources/test_symlinks/{Move.compiled => Move@compiled.snap} (100%) diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/external/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external/Move@progress.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external/Move.progress rename to external-crates/move/crates/move-package/tests/test_sources/external/Move@progress.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@progress.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress rename to external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@progress.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@progress.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.progress rename to external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@progress.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@progress.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.progress rename to external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@progress.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@progress.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.progress rename to external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@progress.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@notlocked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@notlocked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@compiled.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@locked.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@locked.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@resolved.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.resolved rename to external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@resolved.snap diff --git a/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move@compiled.snap similarity index 100% rename from external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled rename to external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move@compiled.snap From d6488e6efda8af726f09aad42870d79ee96feda1 Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 16:11:51 -0800 Subject: [PATCH 03/10] Fix test runner --- .../crates/move-command-line-common/src/testing.rs | 1 + .../move/crates/move-package/tests/test_runner.rs | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/external-crates/move/crates/move-command-line-common/src/testing.rs b/external-crates/move/crates/move-command-line-common/src/testing.rs index 4acb1d9f98dc1..8b662605be353 100644 --- a/external-crates/move/crates/move-command-line-common/src/testing.rs +++ b/external-crates/move/crates/move-command-line-common/src/testing.rs @@ -153,6 +153,7 @@ macro_rules! insta_assert { } => {{ let name: String = $name.into(); let i: &std::path::Path = $input.as_ref(); + let i = i.canonicalize().unwrap(); let c = $contents; let mut settings = $options.into_settings(); settings.set_snapshot_path(i.parent().unwrap()); diff --git a/external-crates/move/crates/move-package/tests/test_runner.rs b/external-crates/move/crates/move-package/tests/test_runner.rs index 91858e759d460..10dfa020a24a0 100644 --- a/external-crates/move/crates/move-package/tests/test_runner.rs +++ b/external-crates/move/crates/move-package/tests/test_runner.rs @@ -22,6 +22,10 @@ use tempfile::{tempdir, TempDir}; const EXTENSIONS: &[&str] = &["progress", "resolved", "locked", "notlocked", "compiled"]; +pub fn snapshot_path(pkg: &Path, name: &str, kind: &str) -> PathBuf { + pkg.join(format!("{name}@{kind}.snap")) +} + pub fn run_test(path: &Path) -> datatest_stable::Result<()> { if path.iter().any(|part| part == "deps_only") { return Ok(()); @@ -62,12 +66,15 @@ impl Test<'_> { toml_path: &'p Path, kind: &'static str, ) -> datatest_stable::Result>> { - let expected = toml_path.with_extension(kind); + dbg!(&toml_path); + let name = toml_path.file_stem().unwrap().to_string_lossy().to_string(); + let expected = snapshot_path(toml_path.parent().unwrap(), &name, kind); + dbg!(&expected); if !expected.is_file() { Ok(None) } else { Ok(Some(Test { - test_name: toml_path.file_stem().unwrap().to_string_lossy().to_string(), + test_name: name, toml_path, kind, output_dir: tempdir()?, @@ -79,7 +86,7 @@ impl Test<'_> { package_hooks::register_package_hooks(Box::new(TestHooks())); let output = self.output().unwrap_or_else(|err| format!("{:#}\n", err)); insta_assert! { - name: self.test_name, + name: &self.test_name, input_path: self.toml_path, contents: output, suffix: self.kind, From 16c0377a1206db4c4aa061210af4b633b6e2fa11 Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 16:22:24 -0800 Subject: [PATCH 04/10] add headers --- .../tests/test_sources/basic_no_deps/Move@compiled.snap | 3 +++ .../tests/test_sources/basic_no_deps/Move@locked.snap | 3 +++ .../tests/test_sources/basic_no_deps/Move@resolved.snap | 3 +++ .../basic_no_deps_address_assigned/Move@compiled.snap | 3 +++ .../basic_no_deps_address_assigned/Move@locked.snap | 3 +++ .../basic_no_deps_address_assigned/Move@resolved.snap | 3 +++ .../basic_no_deps_address_not_assigned/Move@resolved.snap | 3 +++ .../Move@compiled.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../test_sources/basic_no_deps_test_mode/Move@compiled.snap | 3 +++ .../test_sources/case_insensitive_check/Move@compiled.snap | 3 +++ .../test_sources/conflicting_dependencies/Move@resolved.snap | 3 +++ .../conflicting_dev_address_with_dep/Move@resolved.snap | 3 +++ .../conflicting_dev_address_with_dev_dep/Move@resolved.snap | 3 +++ .../test_sources/conflicting_dev_addresses/Move@resolved.snap | 3 +++ .../conflicting_direct_and_indirect/Move@resolved.snap | 3 +++ .../tests/test_sources/dep_dev_dep_diamond/Move@locked.snap | 3 +++ .../tests/test_sources/dep_dev_dep_diamond/Move@resolved.snap | 3 +++ .../tests/test_sources/dep_good_digest/Move@locked.snap | 3 +++ .../tests/test_sources/dep_good_digest/Move@resolved.snap | 3 +++ .../diamond_problem_backflow_resolution/Move@compiled.snap | 3 +++ .../diamond_problem_backflow_resolution/Move@resolved.snap | 3 +++ .../test_sources/diamond_problem_conflict/Move@resolved.snap | 3 +++ .../diamond_problem_dep_conflict/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@locked.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_external_conflict/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_external_no_conflict/Move@locked.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_external_override/Move@locked.snap | 3 +++ .../diamond_problem_dep_external_override/Move@resolved.snap | 3 +++ .../Move@locked.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_incorrect_nested/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_nested_conflict/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_nested_override/Move@locked.snap | 3 +++ .../diamond_problem_dep_nested_override/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_override/Move@locked.snap | 3 +++ .../diamond_problem_dep_override/Move@resolved.snap | 3 +++ .../Move@locked.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_two_nested_overrides/Move@locked.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../diamond_problem_dep_with_deps/Move@resolved.snap | 3 +++ .../diamond_problem_dep_with_deps_conflict/Move@resolved.snap | 3 +++ .../diamond_problem_dual_override/Move@resolved.snap | 3 +++ .../diamond_problem_no_conflict/Move@compiled.snap | 3 +++ .../test_sources/diamond_problem_no_conflict/Move@locked.snap | 3 +++ .../diamond_problem_no_conflict/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../test_sources/direct_and_indirect_dep/Move@locked.snap | 3 +++ .../test_sources/direct_and_indirect_dep/Move@resolved.snap | 3 +++ .../tests/test_sources/direct_cyclic_dep/Move@notlocked.snap | 3 +++ .../tests/test_sources/direct_cyclic_dep/Move@resolved.snap | 3 +++ .../move-package/tests/test_sources/external/Move@locked.snap | 3 +++ .../tests/test_sources/external/Move@progress.snap | 3 +++ .../tests/test_sources/external/Move@resolved.snap | 3 +++ .../tests/test_sources/external_bad_dep/Move@locked.snap | 3 +++ .../tests/test_sources/external_bad_dep/Move@resolved.snap | 3 +++ .../tests/test_sources/external_broken/Move@notlocked.snap | 3 +++ .../tests/test_sources/external_broken/Move@resolved.snap | 3 +++ .../tests/test_sources/external_dev_dep/Move@locked.snap | 3 +++ .../tests/test_sources/external_dev_dep/Move@progress.snap | 3 +++ .../tests/test_sources/external_dev_dep/Move@resolved.snap | 3 +++ .../tests/test_sources/external_failing/Move@notlocked.snap | 3 +++ .../tests/test_sources/external_failing/Move@progress.snap | 3 +++ .../tests/test_sources/external_failing/Move@resolved.snap | 3 +++ .../test_sources/external_no_resolver/Move@notlocked.snap | 3 +++ .../test_sources/external_no_resolver/Move@resolved.snap | 3 +++ .../tests/test_sources/external_overlap/Move@locked.snap | 3 +++ .../tests/test_sources/external_overlap/Move@resolved.snap | 3 +++ .../test_sources/external_overlap_fail/Move@notlocked.snap | 3 +++ .../test_sources/external_overlap_fail/Move@resolved.snap | 3 +++ .../external_overlap_fail_symmetric/Move@notlocked.snap | 3 +++ .../external_overlap_fail_symmetric/Move@resolved.snap | 3 +++ .../external_package_batch_response/Move@locked.snap | 3 +++ .../external_package_batch_response/Move@progress.snap | 3 +++ .../external_package_batch_response/Move@resolved.snap | 3 +++ .../test_sources/external_resolver_config/Move@locked.snap | 3 +++ .../test_sources/external_resolver_config/Move@resolved.snap | 3 +++ .../external_resolver_invalid_resolver/Move@resolved.snap | 4 +++- .../Move@resolved.snap | 4 +++- .../tests/test_sources/external_silent/Move@locked.snap | 3 +++ .../tests/test_sources/external_silent/Move@progress.snap | 3 +++ .../tests/test_sources/longer_cyclic_dep/Move@notlocked.snap | 3 +++ .../tests/test_sources/longer_cyclic_dep/Move@resolved.snap | 3 +++ .../test_sources/multiple_deps_from_lock/Move@resolved.snap | 3 +++ .../multiple_deps_from_lock_no_manifest/Move@resolved.snap | 3 +++ .../test_sources/multiple_deps_no_rename/Move@locked.snap | 3 +++ .../multiple_deps_no_rename_conflict/Move@resolved.snap | 3 +++ .../test_sources/multiple_deps_rename/Move@resolved.snap | 3 +++ .../test_sources/multiple_deps_rename_one/Move@compiled.snap | 3 +++ .../test_sources/nested_deps_bad_parent/Move@notlocked.snap | 3 +++ .../test_sources/nested_deps_bad_parent/Move@resolved.snap | 3 +++ .../tests/test_sources/nested_deps_git_local/Move@locked.snap | 3 +++ .../test_sources/nested_deps_git_local/Move@resolved.snap | 3 +++ .../test_sources/nested_deps_local_local/Move@locked.snap | 3 +++ .../tests/test_sources/nested_deps_override/Move@locked.snap | 3 +++ .../test_sources/nested_deps_shared_override/Move@locked.snap | 3 +++ .../nested_deps_shared_override/Move@resolved.snap | 3 +++ .../test_sources/nested_pruned_override/Move@resolved.snap | 3 +++ .../no_git_rev_on_git_dependency/Move@resolved.snap | 3 +++ .../tests/test_sources/one_dep/Move@compiled.snap | 3 +++ .../move-package/tests/test_sources/one_dep/Move@locked.snap | 3 +++ .../tests/test_sources/one_dep/Move@resolved.snap | 3 +++ .../test_sources/one_dep_assigned_address/Move@compiled.snap | 3 +++ .../test_sources/one_dep_assigned_address/Move@resolved.snap | 3 +++ .../tests/test_sources/one_dep_bad_digest/Move@locked.snap | 3 +++ .../tests/test_sources/one_dep_bad_digest/Move@resolved.snap | 3 +++ .../one_dep_multiple_of_same_name/Move@resolved.snap | 3 +++ .../tests/test_sources/one_dep_override/Move@compiled.snap | 3 +++ .../tests/test_sources/one_dep_override/Move@locked.snap | 3 +++ .../tests/test_sources/one_dep_override/Move@resolved.snap | 3 +++ .../one_dep_reassigned_address/Move@resolved.snap | 3 +++ .../tests/test_sources/one_dep_renamed/Move@compiled.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../test_sources/one_dep_with_scripts/Move@compiled.snap | 3 +++ .../tests/test_sources/one_dep_wrong_name/Move@resolved.snap | 3 +++ .../tests/test_sources/package_hooks/Move@resolved.snap | 3 +++ .../parsing_duplicate_address_names/Move@resolved.snap | 3 +++ .../parsing_duplicate_top_level_field/Move@resolved.snap | 3 +++ .../test_sources/parsing_edition_2024/Move@resolved.snap | 3 +++ .../parsing_edition_2024_alpha/Move@resolved.snap | 3 +++ .../test_sources/parsing_edition_2024_beta/Move@resolved.snap | 3 +++ .../parsing_edition_invalid_suffix/Move@resolved.snap | 3 +++ .../test_sources/parsing_edition_legacy/Move@resolved.snap | 3 +++ .../test_sources/parsing_edition_unknown/Move@resolved.snap | 3 +++ .../parsing_edition_unknown_suffix/Move@resolved.snap | 3 +++ .../parsing_flavor_global_storage/Move@resolved.snap | 3 +++ .../tests/test_sources/parsing_flavor_sui/Move@resolved.snap | 3 +++ .../test_sources/parsing_flavor_unknown/Move@resolved.snap | 3 +++ .../test_sources/parsing_full_manifest/Move@resolved.snap | 3 +++ .../parsing_full_manifest_with_extra_field/Move@resolved.snap | 3 +++ .../parsing_integer_subst_in_dependency/Move@resolved.snap | 3 +++ .../test_sources/parsing_invalid_author/Move@resolved.snap | 3 +++ .../test_sources/parsing_invalid_authors/Move@resolved.snap | 3 +++ .../parsing_invalid_hex_address_in_subst/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../test_sources/parsing_minimal_manifest/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../parsing_no_path_set_for_dependency/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../parsing_non_string_address_name/Move@resolved.snap | 3 +++ .../parsing_non_string_address_value/Move@resolved.snap | 3 +++ .../parsing_non_string_local_dep_path/Move@resolved.snap | 3 +++ .../parsing_non_string_package_name/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../parsing_uninstantiated_dev_address/Move@resolved.snap | 3 +++ .../parsing_unknown_toplevel_field/Move@resolved.snap | 3 +++ .../tests/test_sources/resolve_pkg_name/Move@compiled.snap | 3 +++ .../tests/test_sources/resolve_pkg_name/Move@locked.snap | 3 +++ .../tests/test_sources/resolve_pkg_name/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../test_sources/resolve_pkg_name_conflict/Move@resolved.snap | 3 +++ .../resolve_pkg_name_conflict_lockfile/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../resolve_pkg_name_nested_dep_conflict/Move@resolved.snap | 3 +++ .../test_sources/resolve_pkg_name_override/Move@resolved.snap | 3 +++ .../tests/test_sources/resolve_version/Move@locked.snap | 3 +++ .../tests/test_sources/resolve_version/Move@resolved.snap | 3 +++ .../test_sources/resolve_version_diamond/Move@locked.snap | 3 +++ .../test_sources/resolve_version_diamond/Move@resolved.snap | 3 +++ .../resolve_version_diamond_conflict/Move@resolved.snap | 3 +++ .../resolve_version_diamond_deep/Move@locked.snap | 3 +++ .../resolve_version_diamond_deep/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../resolve_version_diamond_deep_success/Move@locked.snap | 3 +++ .../resolve_version_diamond_deep_success/Move@resolved.snap | 3 +++ .../Move@resolved.snap | 3 +++ .../resolve_version_diamond_external/Move@locked.snap | 3 +++ .../resolve_version_diamond_external/Move@resolved.snap | 3 +++ .../resolve_version_diamond_override/Move@locked.snap | 3 +++ .../resolve_version_diamond_override/Move@resolved.snap | 3 +++ .../tests/test_sources/test_symlinks/Move@compiled.snap | 3 +++ 192 files changed, 576 insertions(+), 2 deletions(-) diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@compiled.snap index bd612df2bc73a..26b7328f28994 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "test", address_alias_instantiation: {}, diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@locked.snap index 0532d57b75984..cc5afd83ba66b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@resolved.snap index f139b6175549b..ae8237038822a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/basic_no_deps", diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@compiled.snap index 220778ea35bdd..a792dd435204b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "test", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@locked.snap index 1f5b1eca3f5fd..9eb117afb0d29 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@resolved.snap index 7ba41cacb5048..d255d18acad34 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/basic_no_deps_address_assigned", diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move@resolved.snap index b712376e2a9c7..cb29a9cc24b8a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Unresolved addresses found. To fix this, add an entry for each unresolved address to the [addresses] section of tests/test_sources/basic_no_deps_address_not_assigned/Move.toml: e.g., [addresses] diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@compiled.snap index 9da446a816092..199e8cdca2365 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "test", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@resolved.snap index 0d7dd01f98bec..22c58253520d2 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment", diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move@resolved.snap index 1cd54e6117409..9fe69cd146b0e 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Found unbound dev address assignment 'B = 0x1' in root package 'test'. Dev addresses cannot introduce new named addresses diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move@resolved.snap index 9dc8142112aa8..af632898ea295 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Found unbound dev address assignment 'B = 0x1' in root package 'test-rename'. Dev addresses cannot introduce new named addresses diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move@compiled.snap index dd27f14a08e1d..2b686d01ba6d3 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "test", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move@compiled.snap index f9096189ddbb2..c1da39b857f72 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Module and/or script names found that would cause failures on case insensitive file systems when compiling package 'case_insensitive_check': The following modules and/or scripts would collide as 'set' on the file system: Module 'Set' at path 'tests/test_sources/case_insensitive_check/sources/Set.move' diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move@resolved.snap index 8697b06d13c25..cd0cc9db34923 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Unable to parse Move package manifest: duplicate key: `OtherDep` for key `dependencies` at line 4 column 1 diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move@resolved.snap index e921fef0aed76..57cc165caa66c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1 diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move@resolved.snap index e921fef0aed76..57cc165caa66c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1 diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move@resolved.snap index e921fef0aed76..57cc165caa66c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1 diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move@resolved.snap index f28c929143a09..b0f369830f379 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package A found: At B -> A A = { local = "deps_only/A-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@locked.snap index ef3a0e9ee9c3d..f278a93c8d679 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@resolved.snap index 6040938edf089..ceaccefce0f14 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/dep_dev_dep_diamond", diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@locked.snap index 0d99c2ea197bd..89de43d4a8971 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@resolved.snap index 5a7aa443db9dd..2c38cceeeea4c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/dep_good_digest", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@compiled.snap index 31e1ab56fd702..f7ad82702ac44 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@resolved.snap index 505f1589b7456..5f2c730061153 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_backflow_resolution", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move@resolved.snap index 5990a4e83adee..b727b598d5786 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Processing dependency 'B' of 'Root': Conflicting assignments for address 'BA': '0x2' and '0x1'. diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move@resolved.snap index dcc14fd0a703c..bb2f1ab384489 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package C found: At A -> C C = { local = "deps_only/C-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move@resolved.snap index 36e062339b527..16ba254b4627c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Conflicting "regular" and "dev" overrides found in Root: C = { local = "deps_only/C-v1" } C = { local = "deps_only/C-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@locked.snap index b0bbb4fd01a3b..4b2f473732b06 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@resolved.snap index d39d91217498e..289951746b428 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_dev_override_with_reg", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move@resolved.snap index dffcbdcacdb13..19fcaa4cc1b84 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package ADep found: At A -> ADep ADep = { local = "deps_only/ADep" } # Resolved by ../resolvers/successful.sh diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move@resolved.snap index 0603d630f427c..f05e6966a58e4 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At B -> A ADep = { local = "deps_only/ADep-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move@resolved.snap index dffcbdcacdb13..19fcaa4cc1b84 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package ADep found: At A -> ADep ADep = { local = "deps_only/ADep" } # Resolved by ../resolvers/successful.sh diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@locked.snap index c4b22862f35db..040b48f64d57b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@resolved.snap index fad5fdf889c44..8afe37f4c13ef 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_external_no_conflict", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@locked.snap index e71addc3e7194..44d14f743cfa4 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@resolved.snap index 43af29af1a5df..5de0445efe5e4 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_external_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@locked.snap index 31247485a9693..62f3b4db2188a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@resolved.snap index ef165b4d39e02..4691e82c05150 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_external_override_root", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move@resolved.snap index b37496a174d88..db39c1438cedb 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> C D = { local = "deps_only/D-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move@resolved.snap index dcc14fd0a703c..bb2f1ab384489 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package C found: At A -> C C = { local = "deps_only/C-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move@resolved.snap index 61b4699371aba..755665beae4fe 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': When resolving dependencies for package A, conflicting versions of package D found: At B -> D D = { local = "deps_only/D-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move@resolved.snap index d8d65f39f8fcd..e3469de87c7e3 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'A': Failed to resolve dependencies for package 'C': Failed to resolve dependencies for package 'D': Failed to resolve dependencies for package 'B': Found cycle between packages: C -> D -> B -> C diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move@resolved.snap index 46d77cb0a8041..8c771562669fa 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> C D = { local = "deps_only/D-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move@resolved.snap index 2dee2c8d3e371..24d5837f7ba20 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> C D = { local = "deps_only/D-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move@resolved.snap index 023d9b4c12552..1ee2b9d009191 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'A': When resolving dependencies for package C, conflicting versions of package G found: At E -> G G = { local = "../G-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move@resolved.snap index f78f7e2f23541..202569a8bda6d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': When resolving dependencies for package A, conflicting versions of package F found: At B -> E -> F F = { local = "deps_only/F-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move@resolved.snap index d490bca18c72a..9aed4dc57bbd4 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At B -> A ADep = { local = "deps_only/ADep", addr_subst = { "A" = "0000000000000000000000000000000000000000000000000000000000000007" } } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@locked.snap index 57b12d457a03b..edbe2465685dd 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@resolved.snap index edce16b8457d0..76b76fe0ea298 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_nested_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move@resolved.snap index 19bbf7a9844f4..432b05c8326e6 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package E found: At A -> E E = { local = "deps_only/E-v1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@locked.snap index d542969613365..afe95810d5f01 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@resolved.snap index 01403a1287a54..6bb1c83a48ea1 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@locked.snap index edd0baa8b1384..27223531dde46 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@resolved.snap index 9baca51138d7a..56c0997b6e322 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_transitive_nested_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@locked.snap index 25fd4a8e570db..9355538561614 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@resolved.snap index d1749ce9bd0ff..306367775c0c0 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_two_nested_overrides", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move@resolved.snap index f9adf8ab3cea1..9ebc786ee0b9a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dep_with_deps", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move@resolved.snap index 1f142cdd735af..66eea227033ce 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package E found: At A -> E E = { local = "deps_only/E-v3" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move@resolved.snap index 710778003e492..9ef3feb95c618 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_dual_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@compiled.snap index 31e1ab56fd702..f7ad82702ac44 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@locked.snap index 5179dcebc035c..71c8a8fcc6471 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@resolved.snap index 120cdfd2541e9..54a677df0cfe1 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_no_conflict", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move@resolved.snap index e0b01924fd38c..f3565d4857372 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_with_and_without_override_v1", diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move@resolved.snap index 99e4ede9cedcc..56904e1332d3e 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/diamond_problem_with_and_without_override_v2", diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@locked.snap index 26bf01775d595..c6cffd80ba30d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@resolved.snap index eac8a601bd502..a4b35c5773c31 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/direct_and_indirect_dep", diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@resolved.snap index 2fed73455e38d..1fdf8897f83e1 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'Other': Failed to resolve dependencies for package 'Root': Found cycle between packages: Other -> Root -> Other diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/external/Move@locked.snap index 9f5f2fccc4b0f..6ed35771d8060 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move@progress.snap b/external-crates/move/crates/move-package/tests/test_sources/external/Move@progress.snap index a8c4b2f93054c..b8b4ab3fd12e4 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external/Move@progress.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external/Move@progress.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/successful.sh ../resolvers/successful.sh stderr: Successful External Resolver diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external/Move@resolved.snap index 3168c5e708187..bded720ee85ea 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/external", diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@locked.snap index 59d149a9ef852..0557600be6aa6 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@resolved.snap index d03823e289d67..cca1dca8ae4c5 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Resolving package 'ADep': Unable to find package manifest at "tests/test_sources/external_bad_dep/deps_only/ADep": No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@resolved.snap index 4851b9cdb33bc..1ff6eb89a0815 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': Parsing response from '../resolvers/broken.sh' for dependency 'A' of package 'Root': Deserializing packages: expected an equals, found an identifier at line 1 column 8 diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@locked.snap index 044f15ff8aeac..729c76498f414 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@progress.snap b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@progress.snap index 1e8420d2bc7a9..013d4ebd96794 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@progress.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@progress.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/successful.sh ../resolvers/successful.sh stderr: Successful External Resolver diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@resolved.snap index 523ad80ef4645..055193685c71f 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/external_dev_dep", diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@progress.snap b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@progress.snap index 3058308131d2d..81ed3039510f7 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@progress.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@progress.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/failing.sh ../resolvers/failing.sh stderr: Failed to resolve dependencies for A diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@resolved.snap index 53fefbbf34691..0ba80906d462a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': '../resolvers/failing.sh' failed to resolve dependencies for dependency 'A' of package 'Root'. Exited with code: 1 diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@resolved.snap index 98e5cb8376efa..53412182a26b8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': Running resolver: ../resolvers/doesnt_exist.sh: No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@locked.snap index df681e9e15073..e715f0ba43729 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@resolved.snap index e11225b637f33..ee549037d0c1f 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/external_overlap", diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@resolved.snap index a906f9460d755..22cb3266e81a8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> ADep no dependencies diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@resolved.snap index 2b84c108d3a8c..a439809314d99 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> ADep ADepOther = { local = "deps_only/ADepOther" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@locked.snap index ee0b78596d3a9..03dd78fe00e3f 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@progress.snap b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@progress.snap index 76b6523ded0b6..b9f248305d8d4 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@progress.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@progress.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- RESOLVING DEPENDENCIES IN Anything FROM Root WITH ../resolvers/successful_package_batch_response.sh ../resolvers/successful_package_batch_response.sh stderr: Successful External Resolver diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@resolved.snap index 89724d5e1e05b..8c940ffe2b2a3 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/external_package_batch_response", diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@locked.snap index 027ed6a503771..72964314988ae 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@resolved.snap index 15e0e3ff3513c..71e33ae5dab10 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/external_resolver_config", diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move@resolved.snap index 6866147064b03..debb007fd1c37 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move@resolved.snap @@ -1,3 +1,5 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dependencies]' section of manifest: Malformed external resolver declaration for dependency r.baz = "quz" foo = "bar" - diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move@resolved.snap index cf2f91775d1f8..072a19786e87c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move@resolved.snap @@ -1,3 +1,5 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dependencies]' section of manifest: Malformed external resolver declaration for dependency r.[foo] bar = "baz" - diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@locked.snap index 357f6c5ce6bf4..29ceb499216bc 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@progress.snap b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@progress.snap index 03f9dfe80ed3b..7e5f1d96fd86d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@progress.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move@progress.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/silent.sh diff --git a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@resolved.snap index 0cdfcb0540a6c..f12ba45d03d2d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'A': Failed to resolve dependencies for package 'B': Failed to resolve dependencies for package 'Root': Found cycle between packages: A -> B -> Root -> A diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move@resolved.snap index 8880c36d4a5af..26e9aa83b944d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/multiple_deps_from_lock", diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move@resolved.snap index cfab7f673a2ac..98a19ed3e4e8d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/multiple_deps_from_lock_no_manifest", diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move@locked.snap index 6223fbab28b6c..0bb2d277fd73a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move@resolved.snap index 4167a7120cca2..e5fd5685e8ea0 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Processing dependency 'D' of 'test': Conflicting assignments for address 'A': '0x1' and '0x2'. diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move@resolved.snap index 3e322894e0709..3d2d84b193623 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/multiple_deps_rename", diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move@compiled.snap index b55e56d689a8d..e65b85945416e 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "test", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@notlocked.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@notlocked.snap index 66b14c174351a..66719d0e39462 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@notlocked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@notlocked.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Lock file uncommitted diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@resolved.snap index 8096138d5fad7..e1fa371f2a143 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'NestedDeps': Parsing manifest for 'Nested': No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@locked.snap index ab8df643e9c29..8267260250751 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@resolved.snap index cbb84f79631a2..33f2c05e1c1d9 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/nested_deps_git_local", diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move@locked.snap index c3513005b31ff..5798faba029ba 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move@locked.snap index c3513005b31ff..5798faba029ba 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@locked.snap index f6e88c848912d..427a971bf02d2 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@resolved.snap index 7a0d63792d74f..790e16953f0b1 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/nested_deps_shared_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move@resolved.snap index 1e1fe46a59a4d..92742be95cee4 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/nested_pruned_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move@resolved.snap index 5d40ccafa33f2..a14a0937be034 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dependencies]' section of manifest: Git revision not supplied for dependency diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@compiled.snap index a1f840c778df8..1b138b3c6caff 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@locked.snap index ba3039f5d0028..7ba4031491b76 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@resolved.snap index dc0c387ea283b..5e5b1b799231b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/one_dep", diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@compiled.snap index a1f840c778df8..1b138b3c6caff 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@resolved.snap index 5ee5216e5692f..2cffc032081cd 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/one_dep_assigned_address", diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@locked.snap index c1ac6f7f30305..651a115f229b3 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@resolved.snap index 936ac3418f4b7..320c6f179636e 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Processing dependency 'OtherDep' of 'Root': Source digest mismatch in dependency 'OtherDep' of 'Root'. Expected 'BAD_DIGEST' but got '8EFF033BF69F7DE9EB2DBCA683732C8EB084EE6EC6C2280585CE7ACDB56867F8'. diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move@resolved.snap index 4b081fc24e857..05af97b4c75b3 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/one_dep_multiple_of_same_name", diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@compiled.snap index a1f840c778df8..1b138b3c6caff 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@locked.snap index e329435a00d5f..61be45bd70cdc 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@resolved.snap index 22afaaf633ca5..11391673e88a8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/one_dep_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move@resolved.snap index 83cd780269ece..07220e9661c60 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/one_dep_reassigned_address", diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move@compiled.snap index a1f840c778df8..1b138b3c6caff 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move@resolved.snap index b02295e3c792a..c0ada4426cd07 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/one_dep_unification_across_local_renamings", diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move@resolved.snap index 4359ec9178b90..0e6c802cbc32d 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Processing dependency 'OtherDep' of 'Root': Conflicting assignments for address 'A': '0x1' and '0x2'. diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move@compiled.snap index a1f840c778df8..1b138b3c6caff 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move@resolved.snap index a424e36f26c60..683273c6214d9 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Name of dependency 'WrongNameForDep' does not match dependency's package name 'OtherDep' diff --git a/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move@resolved.snap index 0e0c36951c599..6988bd4cbe7f2 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'test': Fetching 'Pkg': TestHooks resolve dep "Pkg" = "0x1" diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move@resolved.snap index 3f64a096beb78..f3a0489c30364 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Unable to parse Move package manifest: duplicate key: `a` for key `addresses` at line 4 column 1 diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move@resolved.snap index 6dda36c53c81d..13b7cf69ec4ee 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Unable to parse Move package manifest: redefinition of table `package` for key `package` at line 4 column 1 diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move@resolved.snap index a0b28f34d93e3..68d1863d7ec12 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_edition_2024", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move@resolved.snap index 8ce5d339ece18..0f2aa60286b1f 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_edition_2024_alpha", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move@resolved.snap index 4b5ae57fd5a25..2bfecf0785e8e 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_edition_2024_beta", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move@resolved.snap index c8db1b9f175d6..6c3b5f9cd4cee 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "2024;alpha". Current supported editions include: "legacy", "2024.alpha", "2024.beta", and "2024" diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move@resolved.snap index 4576422739ca1..c8255de6d0a0b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_edition_legacy", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move@resolved.snap index 29f0db3a3ecf1..7768d3cebcc93 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "foobar". Current supported editions include: "legacy", "2024.alpha", "2024.beta", and "2024" diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move@resolved.snap index 3546b729a57f9..f295f7fa788ad 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "2024.final". Current supported editions include: "legacy", "2024.alpha", "2024.beta", and "2024" diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move@resolved.snap index 3562daeea0b3e..32368b340d288 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_flavor_global_storage", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move@resolved.snap index 3fca8a7cd6f81..b28f23978b518 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_flavor_sui", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move@resolved.snap index f3e70ed05dc01..190ab803b8098 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Invalid 'flavor'. Unknown flavor "vanilla". Expected one of: "core", "sui" diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move@resolved.snap index c5dbceda420d6..95620a4d2b562 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move@resolved.snap index c5dbceda420d6..95620a4d2b562 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move@resolved.snap index 8be887f25aaa1..c81c0526b0b9f 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dependencies]' section of manifest: Malformed dependency substitution 1. Expected a string, but encountered a integer diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move@resolved.snap index afbeab3fbeedd..92b7f73b31cc8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Invalid author '1' of type integer found. Expected a string. diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move@resolved.snap index 112af012e4a99..b90b457742007 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Invalid author(s) list diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move@resolved.snap index c5dbceda420d6..95620a4d2b562 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move@resolved.snap index 55bced96a5a67..cd7bd99df0c1a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_invalid_identifier_package_name", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move@resolved.snap index b61d26d84ef05..cca0f7313d293 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/parsing_minimal_manifest", diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move@resolved.snap index 69b3f28ad3302..1984aeb8f7b19 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Required field name 'name' not found diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move@resolved.snap index eebb49f8b7a95..8ac0ae9a741fd 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing package manifest: Required field name 'package' not found diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move@resolved.snap index c11f6354da52b..dee4bce9230e8 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dependencies]' section of manifest: must provide exactly one of 'local' or 'git' or 'r.' for dependency. diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move@resolved.snap index c5dbceda420d6..95620a4d2b562 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move@resolved.snap index d84d0e1a68e7d..6f1394d15d9c2 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move@resolved.snap @@ -1,2 +1,5 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[addresses]' section of manifest: Invalid address name b = "0x1" encountered. Expected a string but found a table diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move@resolved.snap index 9ee50740836b2..7e087997f5794 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[addresses]' section of manifest: Invalid address name 1 encountered. Expected a string but found a integer diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move@resolved.snap index 8c0e1821e4f05..760ddf66260df 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dependencies]' section of manifest: Local source path not a string diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move@resolved.snap index adaeaaa260504..1cf091b83cbf0 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[package]' section of manifest: Package name must be a string diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move@resolved.snap index b6a6cc50d24a8..922562cf48932 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dependencies]' section of manifest: Malformed dependency substitution B = "0x1" R = "0x2" . Expected a string, but encountered a table diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move@resolved.snap index 02abbcc8265d7..e33f7327b9727 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Error parsing '[dev-addresses]' section of manifest: Found uninstantiated named address 'b'. All addresses in the 'dev-addresses' field must be instantiated. diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move@resolved.snap index c5dbceda420d6..95620a4d2b562 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2) diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@compiled.snap index 50ce90fd0f347..5a6ae34a61bea 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "Root-rename", address_alias_instantiation: { diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@locked.snap index 27cec68c7eb98..a075d5151a213 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@resolved.snap index c58f24b687e5d..57c447c6ed3d5 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_pkg_name", diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move@resolved.snap index 1fb3a2ceff378..57670502a4bfd 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move@resolved.snap @@ -1 +1,4 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Processing dependency 'B-rename' of 'Root-rename': Conflicting assignments for address 'BA': '0x2' and '0x1'. diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move@resolved.snap index 92860115a1593..0985386009371 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root-rename, conflicting versions of package C-rename found: At A-rename -> C-rename C-rename = { local = "deps_only/C-rename-v3" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move@resolved.snap index 186e1fe117832..82039bf5bd710 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root-rename, conflicting versions of package C-rename found: At A-rename -> C-rename C-rename = { local = "deps_only/C-rename-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move@resolved.snap index 77338ccc70bbb..3deb264edf7c0 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Conflicting "regular" and "dev" overrides found in Root-rename: C-rename = { local = "deps_only/C-v1" } C-rename = { local = "deps_only/C-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move@resolved.snap index c76fd45e2f5b2..b5881f3a7dcdb 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- Failed to resolve dependencies for package 'Root-rename': Conflicting "regular" and "dev" overrides found in B: C-rename = { local = "deps_only/C-v1" } C-rename = { local = "deps_only/C-v2" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move@resolved.snap index b8a0ddf42ba03..bff1df40043cf 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root-rename, conflicting dependencies found: At B -> A ADep-rename = { local = "deps_only/ADep", addr_subst = { "A" = "0000000000000000000000000000000000000000000000000000000000000007" } } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move@resolved.snap index adf3d4216cb5e..feda065ce52dc 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_pkg_name_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@locked.snap index ab2fe9145134c..f08983c5bf645 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@resolved.snap index dab4cb10a6706..7ebc4d8d35fbe 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_version", diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@locked.snap index e61df4416c488..5bd989cdf6eff 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@resolved.snap index 05ba1f8545fed..5e57d42b77c4c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_version_diamond", diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move@resolved.snap index 620dec9d0d591..b85c91fb9c2e7 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting versions of package C found: At A -> C C = { local = "deps_only/C-loc-1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@locked.snap index 73515ac3ee7ce..5af88551c395f 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@resolved.snap index 1c23816f79db1..e87930ff822df 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_version_diamond_deep", diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move@resolved.snap index f61f46b3977c4..de7aa54d18ffc 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> C D = { local = "deps_only/D" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move@resolved.snap index 35c0a01a31b83..bc14f196f9533 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> C D = { local = "deps_only/D-loc-1", addr_subst = { "P1N" = "N" } } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@locked.snap index e77112522509b..7147418b20a3b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@resolved.snap index c138f7b05e8dd..3f0d8bd3ab85a 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_version_diamond_deep_success", diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move@resolved.snap index 517ef1c5d813e..5e46bc40f1b28 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- When resolving dependencies for package Root, conflicting dependencies found: At A -> C D = { local = "deps_only/D-loc-1" } diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@locked.snap index 1e55205387815..1cc5cfdb2bb7c 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@resolved.snap index a81eeb91fcb13..79a5a4b64bae2 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_version_diamond_external", diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@locked.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@locked.snap index 8bc3a232b1c63..be94299a5f2f0 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@locked.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@locked.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- # @generated by Move, please check-in and do not edit manually. [move] diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@resolved.snap b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@resolved.snap index ea844c4e1255c..022790c3bd6e5 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@resolved.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move@resolved.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- ResolvedGraph { graph: DependencyGraph { root_path: "tests/test_sources/resolve_version_diamond_override", diff --git a/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move@compiled.snap b/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move@compiled.snap index 220778ea35bdd..a792dd435204b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move@compiled.snap +++ b/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move@compiled.snap @@ -1,3 +1,6 @@ +--- +source: crates/move-package/tests/test_runner.rs +--- CompiledPackageInfo { package_name: "test", address_alias_instantiation: { From e3459e1d928e94011f2ba7d1d99dc0b77a5cf28d Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 16:32:09 -0800 Subject: [PATCH 05/10] Remove unused bad files --- .../tests/test_sources/multiple_deps_from_lock/Move.unlocked | 0 .../multiple_deps_from_lock_no_manifest/Move.unlocked | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.unlocked delete mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.unlocked diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.unlocked b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.unlocked deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.unlocked b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.unlocked deleted file mode 100644 index e69de29bb2d1d..0000000000000 From 419bf74803d489f98eed8d3eb0efc254abbc9559 Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 16:39:01 -0800 Subject: [PATCH 06/10] fix tests that read from snapshots --- .../move-command-line-common/src/testing.rs | 17 ++++++++++++ .../tests/test_dependency_graph.rs | 26 ++++++++++++------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/external-crates/move/crates/move-command-line-common/src/testing.rs b/external-crates/move/crates/move-command-line-common/src/testing.rs index 8b662605be353..dc7e1da813f55 100644 --- a/external-crates/move/crates/move-command-line-common/src/testing.rs +++ b/external-crates/move/crates/move-command-line-common/src/testing.rs @@ -2,6 +2,8 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 +use std::path::Path; + use crate::env::read_bool_env_var; /// Extension for raw output files @@ -182,3 +184,18 @@ macro_rules! insta_assert { }}; } pub use insta_assert; + +pub fn read_insta_snapshot(path: impl AsRef) -> anyhow::Result { + let path = path.as_ref(); + match insta::Snapshot::from_file(path) + .map_err(|_| anyhow::anyhow!("Failed to load snapshot: {}", path.display()))? + .contents() + { + insta::internals::SnapshotContents::Text(text_snapshot_contents) => { + Ok(format!("{text_snapshot_contents}")) + } + insta::internals::SnapshotContents::Binary(_) => { + anyhow::bail!("Unexpected binary snapshot for path: {}", path.display()) + } + } +} diff --git a/external-crates/move/crates/move-package/tests/test_dependency_graph.rs b/external-crates/move/crates/move-package/tests/test_dependency_graph.rs index b648942a1cbfe..7ee7c5c4a17a2 100644 --- a/external-crates/move/crates/move-package/tests/test_dependency_graph.rs +++ b/external-crates/move/crates/move-package/tests/test_dependency_graph.rs @@ -5,9 +5,10 @@ use std::{ collections::{BTreeMap, BTreeSet}, fs::{self, File}, io::Write, - path::PathBuf, + path::{Path, PathBuf}, }; +use move_command_line_common::testing::read_insta_snapshot; use move_package::{ lock_file::LockFile, resolution::dependency_graph::{ @@ -28,6 +29,10 @@ macro_rules! assert_error_contains { }; } +fn snapshot_path(pkg: &Path, kind: &str) -> PathBuf { + pkg.join(format!("Move@{kind}.snap")) +} + #[test] fn no_dep_graph() { let pkg = no_dep_test_package(); @@ -60,12 +65,13 @@ fn no_dep_graph() { fn no_dep_graph_from_lock() { let pkg = no_dep_test_package(); - let snapshot = pkg.join("Move.locked"); + let snapshot = snapshot_path(&pkg, "locked"); + let contents = read_insta_snapshot(snapshot).unwrap(); let graph = DependencyGraph::read_from_lock( pkg, Symbol::from("Root"), Symbol::from("Root"), - &mut File::open(snapshot).expect("Opening snapshot"), + &mut contents.as_bytes(), None, ) .expect("Reading DependencyGraph"); @@ -83,14 +89,15 @@ fn lock_file_roundtrip() { let tmp = tempfile::tempdir().unwrap(); let pkg = one_dep_test_package(); - let snapshot = pkg.join("Move.locked"); + let snapshot = snapshot_path(&pkg, "locked"); + let contents = read_insta_snapshot(snapshot).unwrap(); let commit = tmp.path().join("Move.lock"); let graph = DependencyGraph::read_from_lock( pkg, Symbol::from("Root"), Symbol::from("Root"), - &mut File::open(&snapshot).expect("Opening snapshot"), + &mut contents.as_bytes(), None, ) .expect("Reading DependencyGraph"); @@ -101,11 +108,11 @@ fn lock_file_roundtrip() { lock.commit(&commit).expect("Committing lock file"); - let expect = fs::read_to_string(&snapshot).expect("Reading snapshot"); let actual = fs::read_to_string(commit).expect("Reading committed lock"); assert_eq!( - expect, actual, + contents, + actual.trim(), "LockFile -> DependencyGraph -> LockFile roundtrip" ); } @@ -182,13 +189,14 @@ fn always_deps() { #[test] fn always_deps_from_lock() { let pkg = dev_dep_test_package(); - let snapshot = pkg.join("Move.locked"); + let snapshot = snapshot_path(&pkg, "locked"); + let contents = read_insta_snapshot(snapshot).unwrap(); let graph = DependencyGraph::read_from_lock( pkg, Symbol::from("Root"), Symbol::from("Root"), - &mut File::open(snapshot).expect("Opening snapshot"), + &mut contents.as_bytes(), None, ) .expect("Creating DependencyGraph"); From 7fd0e2301949fc20db09032ef56c1c87fee32b84 Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 17:02:41 -0800 Subject: [PATCH 07/10] create empty files --- .../move-package/tests/test_sources/basic_no_deps/Move.compiled | 0 .../move-package/tests/test_sources/basic_no_deps/Move.locked | 0 .../move-package/tests/test_sources/basic_no_deps/Move.resolved | 0 .../test_sources/basic_no_deps_address_assigned/Move.compiled | 0 .../tests/test_sources/basic_no_deps_address_assigned/Move.locked | 0 .../test_sources/basic_no_deps_address_assigned/Move.resolved | 0 .../test_sources/basic_no_deps_address_not_assigned/Move.resolved | 0 .../Move.compiled | 0 .../Move.resolved | 0 .../basic_no_deps_invalid_dev_address_assignment/Move.resolved | 0 .../Move.resolved | 0 .../tests/test_sources/basic_no_deps_test_mode/Move.compiled | 0 .../tests/test_sources/case_insensitive_check/Move.compiled | 0 .../tests/test_sources/conflicting_dependencies/Move.resolved | 0 .../test_sources/conflicting_dev_address_with_dep/Move.resolved | 0 .../conflicting_dev_address_with_dev_dep/Move.resolved | 0 .../tests/test_sources/conflicting_dev_addresses/Move.resolved | 0 .../test_sources/conflicting_direct_and_indirect/Move.resolved | 0 .../tests/test_sources/dep_dev_dep_diamond/Move.locked | 0 .../tests/test_sources/dep_dev_dep_diamond/Move.resolved | 0 .../move-package/tests/test_sources/dep_good_digest/Move.locked | 0 .../move-package/tests/test_sources/dep_good_digest/Move.resolved | 0 .../diamond_problem_backflow_resolution/Move.compiled | 0 .../diamond_problem_backflow_resolution/Move.resolved | 0 .../tests/test_sources/diamond_problem_conflict/Move.resolved | 0 .../tests/test_sources/diamond_problem_dep_conflict/Move.resolved | 0 .../Move.resolved | 0 .../diamond_problem_dep_dev_override_with_reg/Move.locked | 0 .../diamond_problem_dep_dev_override_with_reg/Move.resolved | 0 .../diamond_problem_dep_external_conflict/Move.resolved | 0 .../Move.resolved | 0 .../Move.resolved | 0 .../diamond_problem_dep_external_no_conflict/Move.locked | 0 .../diamond_problem_dep_external_no_conflict/Move.resolved | 0 .../diamond_problem_dep_external_override/Move.locked | 0 .../diamond_problem_dep_external_override/Move.resolved | 0 .../diamond_problem_dep_external_override_root/Move.locked | 0 .../diamond_problem_dep_external_override_root/Move.resolved | 0 .../Move.resolved | 0 .../diamond_problem_dep_incorrect_dev_override/Move.resolved | 0 .../diamond_problem_dep_incorrect_nested/Move.resolved | 0 .../diamond_problem_dep_incorrect_override_cycle/Move.resolved | 0 .../diamond_problem_dep_incorrect_override_empty/Move.resolved | 0 .../diamond_problem_dep_incorrect_override_occupied/Move.resolved | 0 .../diamond_problem_dep_nested_conflict/Move.resolved | 0 .../diamond_problem_dep_nested_conflict_deep/Move.resolved | 0 .../diamond_problem_dep_nested_dep_conflict/Move.resolved | 0 .../test_sources/diamond_problem_dep_nested_override/Move.locked | 0 .../diamond_problem_dep_nested_override/Move.resolved | 0 .../Move.resolved | 0 .../tests/test_sources/diamond_problem_dep_override/Move.locked | 0 .../tests/test_sources/diamond_problem_dep_override/Move.resolved | 0 .../diamond_problem_dep_transitive_nested_override/Move.locked | 0 .../diamond_problem_dep_transitive_nested_override/Move.resolved | 0 .../diamond_problem_dep_two_nested_overrides/Move.locked | 0 .../diamond_problem_dep_two_nested_overrides/Move.resolved | 0 .../test_sources/diamond_problem_dep_with_deps/Move.resolved | 0 .../diamond_problem_dep_with_deps_conflict/Move.resolved | 0 .../test_sources/diamond_problem_dual_override/Move.resolved | 0 .../tests/test_sources/diamond_problem_no_conflict/Move.compiled | 0 .../tests/test_sources/diamond_problem_no_conflict/Move.locked | 0 .../tests/test_sources/diamond_problem_no_conflict/Move.resolved | 0 .../diamond_problem_with_and_without_override_v1/Move.resolved | 0 .../diamond_problem_with_and_without_override_v2/Move.resolved | 0 .../tests/test_sources/direct_and_indirect_dep/Move.locked | 0 .../tests/test_sources/direct_and_indirect_dep/Move.resolved | 0 .../tests/test_sources/direct_cyclic_dep/Move.notlocked | 0 .../tests/test_sources/direct_cyclic_dep/Move.resolved | 0 .../crates/move-package/tests/test_sources/external/Move.locked | 0 .../crates/move-package/tests/test_sources/external/Move.progress | 0 .../crates/move-package/tests/test_sources/external/Move.resolved | 0 .../move-package/tests/test_sources/external_bad_dep/Move.locked | 0 .../tests/test_sources/external_bad_dep/Move.resolved | 0 .../tests/test_sources/external_broken/Move.notlocked | 0 .../move-package/tests/test_sources/external_broken/Move.resolved | 0 .../move-package/tests/test_sources/external_dev_dep/Move.locked | 0 .../tests/test_sources/external_dev_dep/Move.progress | 0 .../tests/test_sources/external_dev_dep/Move.resolved | 0 .../tests/test_sources/external_failing/Move.notlocked | 0 .../tests/test_sources/external_failing/Move.progress | 0 .../tests/test_sources/external_failing/Move.resolved | 0 .../tests/test_sources/external_no_resolver/Move.notlocked | 0 .../tests/test_sources/external_no_resolver/Move.resolved | 0 .../move-package/tests/test_sources/external_overlap/Move.locked | 0 .../tests/test_sources/external_overlap/Move.resolved | 0 .../tests/test_sources/external_overlap_fail/Move.notlocked | 0 .../tests/test_sources/external_overlap_fail/Move.resolved | 0 .../test_sources/external_overlap_fail_symmetric/Move.notlocked | 0 .../test_sources/external_overlap_fail_symmetric/Move.resolved | 0 .../test_sources/external_package_batch_response/Move.locked | 0 .../test_sources/external_package_batch_response/Move.progress | 0 .../test_sources/external_package_batch_response/Move.resolved | 0 .../tests/test_sources/external_resolver_config/Move.locked | 0 .../tests/test_sources/external_resolver_config/Move.resolved | 0 .../test_sources/external_resolver_invalid_resolver/Move.resolved | 0 .../Move.resolved | 0 .../move-package/tests/test_sources/external_silent/Move.locked | 0 .../move-package/tests/test_sources/external_silent/Move.progress | 0 .../tests/test_sources/longer_cyclic_dep/Move.notlocked | 0 .../tests/test_sources/longer_cyclic_dep/Move.resolved | 0 .../tests/test_sources/multiple_deps_from_lock/Move.resolved | 0 .../multiple_deps_from_lock_no_manifest/Move.resolved | 0 .../tests/test_sources/multiple_deps_no_rename/Move.locked | 0 .../test_sources/multiple_deps_no_rename_conflict/Move.resolved | 0 .../tests/test_sources/multiple_deps_rename/Move.resolved | 0 .../tests/test_sources/multiple_deps_rename_one/Move.compiled | 0 .../tests/test_sources/nested_deps_bad_parent/Move.notlocked | 0 .../tests/test_sources/nested_deps_bad_parent/Move.resolved | 0 .../tests/test_sources/nested_deps_git_local/Move.locked | 0 .../tests/test_sources/nested_deps_git_local/Move.resolved | 0 .../tests/test_sources/nested_deps_local_local/Move.locked | 0 .../tests/test_sources/nested_deps_override/Move.locked | 0 .../tests/test_sources/nested_deps_shared_override/Move.locked | 0 .../tests/test_sources/nested_deps_shared_override/Move.resolved | 0 .../tests/test_sources/nested_pruned_override/Move.resolved | 0 .../tests/test_sources/no_git_rev_on_git_dependency/Move.resolved | 0 .../crates/move-package/tests/test_sources/one_dep/Move.compiled | 0 .../crates/move-package/tests/test_sources/one_dep/Move.locked | 0 .../crates/move-package/tests/test_sources/one_dep/Move.resolved | 0 .../tests/test_sources/one_dep_assigned_address/Move.compiled | 0 .../tests/test_sources/one_dep_assigned_address/Move.resolved | 0 .../tests/test_sources/one_dep_bad_digest/Move.locked | 0 .../tests/test_sources/one_dep_bad_digest/Move.resolved | 0 .../test_sources/one_dep_multiple_of_same_name/Move.resolved | 0 .../tests/test_sources/one_dep_override/Move.compiled | 0 .../move-package/tests/test_sources/one_dep_override/Move.locked | 0 .../tests/test_sources/one_dep_override/Move.resolved | 0 .../tests/test_sources/one_dep_reassigned_address/Move.resolved | 0 .../move-package/tests/test_sources/one_dep_renamed/Move.compiled | 0 .../one_dep_unification_across_local_renamings/Move.resolved | 0 .../Move.resolved | 0 .../tests/test_sources/one_dep_with_scripts/Move.compiled | 0 .../tests/test_sources/one_dep_wrong_name/Move.resolved | 0 .../move-package/tests/test_sources/package_hooks/Move.resolved | 0 .../test_sources/parsing_duplicate_address_names/Move.resolved | 0 .../test_sources/parsing_duplicate_top_level_field/Move.resolved | 0 .../tests/test_sources/parsing_edition_2024/Move.resolved | 0 .../tests/test_sources/parsing_edition_2024_alpha/Move.resolved | 0 .../tests/test_sources/parsing_edition_2024_beta/Move.resolved | 0 .../test_sources/parsing_edition_invalid_suffix/Move.resolved | 0 .../tests/test_sources/parsing_edition_legacy/Move.resolved | 0 .../tests/test_sources/parsing_edition_unknown/Move.resolved | 0 .../test_sources/parsing_edition_unknown_suffix/Move.resolved | 0 .../test_sources/parsing_flavor_global_storage/Move.resolved | 0 .../tests/test_sources/parsing_flavor_sui/Move.resolved | 0 .../tests/test_sources/parsing_flavor_unknown/Move.resolved | 0 .../tests/test_sources/parsing_full_manifest/Move.resolved | 0 .../parsing_full_manifest_with_extra_field/Move.resolved | 0 .../parsing_integer_subst_in_dependency/Move.resolved | 0 .../tests/test_sources/parsing_invalid_author/Move.resolved | 0 .../tests/test_sources/parsing_invalid_authors/Move.resolved | 0 .../parsing_invalid_hex_address_in_subst/Move.resolved | 0 .../parsing_invalid_identifier_package_name/Move.resolved | 0 .../tests/test_sources/parsing_minimal_manifest/Move.resolved | 0 .../parsing_missing_minimal_required_field_name/Move.resolved | 0 .../parsing_missing_required_package_segment/Move.resolved | 0 .../test_sources/parsing_no_path_set_for_dependency/Move.resolved | 0 .../parsing_non_identifier_address_name_in_subst/Move.resolved | 0 .../test_sources/parsing_non_string_address_name/Move.resolved | 0 .../test_sources/parsing_non_string_address_value/Move.resolved | 0 .../test_sources/parsing_non_string_local_dep_path/Move.resolved | 0 .../test_sources/parsing_non_string_package_name/Move.resolved | 0 .../parsing_too_many_entries_renaming_instantiation/Move.resolved | 0 .../test_sources/parsing_uninstantiated_dev_address/Move.resolved | 0 .../test_sources/parsing_unknown_toplevel_field/Move.resolved | 0 .../tests/test_sources/resolve_pkg_name/Move.compiled | 0 .../move-package/tests/test_sources/resolve_pkg_name/Move.locked | 0 .../tests/test_sources/resolve_pkg_name/Move.resolved | 0 .../resolve_pkg_name_address_resolution_conflict/Move.resolved | 0 .../tests/test_sources/resolve_pkg_name_conflict/Move.resolved | 0 .../test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved | 0 .../Move.resolved | 0 .../Move.resolved | 0 .../resolve_pkg_name_nested_dep_conflict/Move.resolved | 0 .../tests/test_sources/resolve_pkg_name_override/Move.resolved | 0 .../move-package/tests/test_sources/resolve_version/Move.locked | 0 .../move-package/tests/test_sources/resolve_version/Move.resolved | 0 .../tests/test_sources/resolve_version_diamond/Move.locked | 0 .../tests/test_sources/resolve_version_diamond/Move.resolved | 0 .../test_sources/resolve_version_diamond_conflict/Move.resolved | 0 .../tests/test_sources/resolve_version_diamond_deep/Move.locked | 0 .../tests/test_sources/resolve_version_diamond_deep/Move.resolved | 0 .../resolve_version_diamond_deep_dep_missmatch/Move.resolved | 0 .../resolve_version_diamond_deep_rename_conflict/Move.resolved | 0 .../test_sources/resolve_version_diamond_deep_success/Move.locked | 0 .../resolve_version_diamond_deep_success/Move.resolved | 0 .../resolve_version_diamond_deep_version_mismatch/Move.resolved | 0 .../test_sources/resolve_version_diamond_external/Move.locked | 0 .../test_sources/resolve_version_diamond_external/Move.resolved | 0 .../test_sources/resolve_version_diamond_override/Move.locked | 0 .../test_sources/resolve_version_diamond_override/Move.resolved | 0 .../move-package/tests/test_sources/test_symlinks/Move.compiled | 0 192 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external/Move.progress create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.progress create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.progress create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.progress create mode 100644 external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.compiled create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked create mode 100644 external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.resolved create mode 100644 external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment_name_resolution/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external/Move.progress new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_broken/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.progress new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_failing/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.progress new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_package_batch_response/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_config/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/external_resolver_invalid_resolver_invalid_target/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.progress b/external-crates/move/crates/move-package/tests/test_sources/external_silent/Move.progress new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_address_resolution_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_conflict_lockfile/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_dep_conflicting_dep_reg_overrides_nested/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_nested_dep_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_pkg_name_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_dep_missmatch/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_rename_conflict/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_success/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_deep_version_mismatch/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_external/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.locked new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.resolved b/external-crates/move/crates/move-package/tests/test_sources/resolve_version_diamond_override/Move.resolved new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled b/external-crates/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled new file mode 100644 index 0000000000000..e69de29bb2d1d From 738b1fddbdc9c62661a574bd21749c7d9f55ef26 Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Mon, 3 Feb 2025 17:07:13 -0800 Subject: [PATCH 08/10] change test to use marker files --- .../crates/move-package/tests/test_runner.rs | 76 ++++++++----------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/external-crates/move/crates/move-package/tests/test_runner.rs b/external-crates/move/crates/move-package/tests/test_runner.rs index 10dfa020a24a0..7367e3593df3c 100644 --- a/external-crates/move/crates/move-package/tests/test_runner.rs +++ b/external-crates/move/crates/move-package/tests/test_runner.rs @@ -2,7 +2,7 @@ // Copyright (c) The Move Contributors // SPDX-License-Identifier: Apache-2.0 -use anyhow::{anyhow, bail}; +use anyhow::bail; use move_command_line_common::testing::insta_assert; use move_package::{ compilation::{build_plan::BuildPlan, compiled_package::CompiledPackageInfo}, @@ -20,8 +20,6 @@ use std::{ }; use tempfile::{tempdir, TempDir}; -const EXTENSIONS: &[&str] = &["progress", "resolved", "locked", "notlocked", "compiled"]; - pub fn snapshot_path(pkg: &Path, name: &str, kind: &str) -> PathBuf { pkg.join(format!("{name}@{kind}.snap")) } @@ -31,55 +29,31 @@ pub fn run_test(path: &Path) -> datatest_stable::Result<()> { return Ok(()); } - let mut tests = EXTENSIONS - .iter() - .filter_map(|kind| Test::from_path_with_kind(path, kind).transpose()) - .peekable(); - - if tests.peek().is_none() { - return Err(anyhow!( - "No snapshot file found for {:?}, please add a file with the same basename and one \ - of the following extensions: {:#?}\n\n\ - You probably want to re-run with `env UPDATE_BASELINE=1` after adding this file.", - path, - EXTENSIONS, - ) - .into()); - } - - for test in tests { - test?.run()? - } - - Ok(()) + let kind = path.extension().unwrap().to_string_lossy(); + let toml_path = path.with_extension("toml"); + Test::from_path_with_kind(&toml_path, &kind)?.run() } struct Test<'a> { test_name: String, - kind: &'static str, + kind: &'a str, toml_path: &'a Path, output_dir: TempDir, } impl Test<'_> { - fn from_path_with_kind<'p>( - toml_path: &'p Path, - kind: &'static str, - ) -> datatest_stable::Result>> { + fn from_path_with_kind<'a>( + toml_path: &'a Path, + kind: &'a str, + ) -> datatest_stable::Result> { dbg!(&toml_path); let name = toml_path.file_stem().unwrap().to_string_lossy().to_string(); - let expected = snapshot_path(toml_path.parent().unwrap(), &name, kind); - dbg!(&expected); - if !expected.is_file() { - Ok(None) - } else { - Ok(Some(Test { - test_name: name, - toml_path, - kind, - output_dir: tempdir()?, - })) - } + Ok(Test { + test_name: name, + toml_path, + kind, + output_dir: tempdir()?, + }) } fn run(&self) -> datatest_stable::Result<()> { @@ -199,5 +173,21 @@ impl PackageHooks for TestHooks { .map(|v| Symbol::from(v.as_ref()))) } } - -datatest_stable::harness!(run_test, "tests/test_sources", r".*\.toml$"); +// &["progress", "resolved", "locked", "notlocked", "compiled"]; +datatest_stable::harness!( + run_test, + "tests/test_sources", + r".*\.progress$", + run_test, + "tests/test_sources", + r".*\.resolved$", + run_test, + "tests/test_sources", + r".*\.locked$", + run_test, + "tests/test_sources", + r".*\.notlocked$", + run_test, + "tests/test_sources", + r".*\.compiled$", +); From 3b424124b219c493b485dba55fdaf8e86dd206c0 Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Tue, 4 Feb 2025 10:25:08 -0800 Subject: [PATCH 09/10] fix move tests --- .../move/crates/move-compiler/tests/move_check_testsuite.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/external-crates/move/crates/move-compiler/tests/move_check_testsuite.rs b/external-crates/move/crates/move-compiler/tests/move_check_testsuite.rs index 9216bd999efeb..15143b4ae8df0 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check_testsuite.rs +++ b/external-crates/move/crates/move-compiler/tests/move_check_testsuite.rs @@ -244,8 +244,10 @@ pub fn run_test(path: &Path) -> datatest_stable::Result<()> { } let mut options = InstaOptions::new(); - options.info = Some(test_info); - options.suffix = suffix; + options.info(test_info); + if let Some(suffix) = suffix { + options.suffix(suffix); + } insta_assert! { name: test_name, input_path: move_path, From 25058030118555c075d5e40fe45fa181721a5dc6 Mon Sep 17 00:00:00 2001 From: Todd Nowacki Date: Wed, 5 Feb 2025 11:45:01 -0800 Subject: [PATCH 10/10] removed unused function --- external-crates/move/crates/move-package/tests/test_runner.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/external-crates/move/crates/move-package/tests/test_runner.rs b/external-crates/move/crates/move-package/tests/test_runner.rs index 7367e3593df3c..5680e45dc90c0 100644 --- a/external-crates/move/crates/move-package/tests/test_runner.rs +++ b/external-crates/move/crates/move-package/tests/test_runner.rs @@ -20,10 +20,6 @@ use std::{ }; use tempfile::{tempdir, TempDir}; -pub fn snapshot_path(pkg: &Path, name: &str, kind: &str) -> PathBuf { - pkg.join(format!("{name}@{kind}.snap")) -} - pub fn run_test(path: &Path) -> datatest_stable::Result<()> { if path.iter().any(|part| part == "deps_only") { return Ok(());