format

aptos-labs · Jun 5, 2024 · 5553f5b · 5553f5b
1 parent e2bca36
commit 5553f5b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/aptos-move/framework/src/built_package.rs b/aptos-move/framework/src/built_package.rs
@@ -26,7 +26,10 @@ use move_model::{
 };
 use move_package::{
     compilation::{compiled_package::CompiledPackage, package_layout::CompiledPackageLayout},
-    source_package::{manifest_parser::{parse_move_manifest_string, parse_source_manifest}, std_lib::StdVersion},
+    source_package::{
+        manifest_parser::{parse_move_manifest_string, parse_source_manifest},
+        std_lib::StdVersion,
+    },
     BuildConfig, CompilerConfig, ModelConfig,
 };
 use serde::{Deserialize, Serialize};

diff --git a/crates/aptos/src/move_tool/mod.rs b/crates/aptos/src/move_tool/mod.rs
@@ -50,7 +50,10 @@ use move_cli::{self, base::test::UnitTestResult};
 use move_command_line_common::env::MOVE_HOME;
 use move_core_types::{identifier::Identifier, language_storage::ModuleId, u256::U256};
 use move_model::metadata::{CompilerVersion, LanguageVersion};
-use move_package::{source_package::{layout::SourcePackageLayout, std_lib::StdVersion}, BuildConfig, CompilerConfig};
+use move_package::{
+    source_package::{layout::SourcePackageLayout, std_lib::StdVersion},
+    BuildConfig, CompilerConfig,
+};
 use move_unit_test::UnitTestingConfig;
 pub use package_hooks::*;
 use serde::{Deserialize, Serialize};

diff --git a/third_party/move/tools/move-package/src/resolution/resolution_graph.rs b/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
@@ -121,7 +121,7 @@ impl ResolvingGraph {
                 root_package.clone(),
                 root_package_path,
                 true,
-                &override_std,
+                override_std,
                 writer,
             )
             .with_context(|| {

diff --git a/third_party/move/tools/move-package/src/source_package/std_lib.rs b/third_party/move/tools/move-package/src/source_package/std_lib.rs
@@ -1,13 +1,14 @@
 // Copyright (c) Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::source_package::parsed_manifest::{Dependency, GitInfo};
+use crate::{
+    manifest_parser::git_repo_cache_path,
+    source_package::parsed_manifest::{Dependency, GitInfo},
+};
 use clap::ValueEnum;
 use move_symbol_pool::symbol::Symbol;
-use std::{fmt::Display, path::PathBuf};
 use serde::{Deserialize, Serialize};
-
-use crate::manifest_parser::git_repo_cache_path;
+use std::{fmt::Display, path::PathBuf};
 
 /// Represents a standard library.
 pub enum StdLib {

diff --git a/third_party/move/tools/move-package/tests/test_runner.rs b/third_party/move/tools/move-package/tests/test_runner.rs
@@ -10,12 +10,12 @@ use move_compiler::shared::known_attributes::KnownAttribute;
 use move_model::metadata::{CompilerVersion, LanguageVersion};
 use move_package::{
     compilation::{build_plan::BuildPlan, model_builder::ModelBuilder},
-    package_hooks,
-    package_hooks::PackageHooks,
+    package_hooks::{self, PackageHooks},
     resolution::resolution_graph as RG,
     source_package::{
         manifest_parser as MP,
         parsed_manifest::{CustomDepInfo, PackageDigest},
+        std_lib::StdVersion,
     },
     BuildConfig, CompilerConfig, ModelConfig,
 };
@@ -42,7 +42,10 @@ fn run_test_impl(
     compiler_config.compiler_version = Some(compiler_version);
     let override_path = path.with_extension(OVERRIDE_EXT);
     let override_std = if override_path.is_file() {
-        Some(fs::read_to_string(override_path)?)
+        Some(
+            StdVersion::from_rev(&fs::read_to_string(override_path)?)
+                .expect("one of mainnet/testnet/devnet"),
+        )
     } else {
         None
     };