Experimental StorageKey feature

Author: mohammadfawaz

forc-pkg/src/manifest.rs

@@ -213,6 +213,7 @@ pub struct BuildProfile {
     pub include_tests: bool,
     pub json_abi_with_callpaths: bool,
     pub error_on_warnings: bool,
+    pub experimental_storage: bool,
 }
 
 impl Dependency {
@@ -602,6 +603,7 @@ impl BuildProfile {
             include_tests: false,
             json_abi_with_callpaths: false,
             error_on_warnings: false,
+            experimental_storage: false,
         }
     }
 
@@ -617,6 +619,7 @@ impl BuildProfile {
             include_tests: false,
             json_abi_with_callpaths: false,
             error_on_warnings: false,
+            experimental_storage: false,
         }
     }
 }

forc-pkg/src/pkg.rs

@@ -297,6 +297,8 @@ pub struct BuildOpts {
     pub tests: bool,
     /// The set of options to filter by member project kind.
     pub member_filter: MemberFilter,
+    /// Enable the experimental storage implementation and UI.
+    pub experimental_storage: bool,
 }
 
 /// The set of options to filter type of projects to build in a workspace.
@@ -1510,7 +1512,8 @@ pub fn sway_build_config(
     .print_finalized_asm(build_profile.print_finalized_asm)
     .print_intermediate_asm(build_profile.print_intermediate_asm)
     .print_ir(build_profile.print_ir)
-    .include_tests(build_profile.include_tests);
+    .include_tests(build_profile.include_tests)
+    .experimental_storage(build_profile.experimental_storage);
     Ok(build_config)
 }
 
@@ -1952,6 +1955,7 @@ fn build_profile_from_opts(
         time_phases,
         tests,
         error_on_warnings,
+        experimental_storage,
         ..
     } = build_options;
     let mut selected_build_profile = BuildProfile::DEBUG;
@@ -1997,6 +2001,7 @@ fn build_profile_from_opts(
     profile.include_tests |= tests;
     profile.json_abi_with_callpaths |= pkg.json_abi_with_callpaths;
     profile.error_on_warnings |= error_on_warnings;
+    profile.experimental_storage |= experimental_storage;
 
     Ok((selected_build_profile.to_string(), profile))
 }

forc-plugins/forc-client/src/op/deploy.rs

@@ -177,5 +177,6 @@ fn build_opts_from_cmd(cmd: &cmd::Deploy) -> pkg::BuildOpts {
         build_target: BuildTarget::default(),
         tests: false,
         member_filter: pkg::MemberFilter::only_contracts(),
+        experimental_storage: cmd.build_profile.experimental_storage,
     }
 }

forc-plugins/forc-client/src/op/run.rs

@@ -173,5 +173,6 @@ fn build_opts_from_cmd(cmd: &cmd::Run) -> pkg::BuildOpts {
         debug_outfile: cmd.build_output.debug_file.clone(),
         tests: false,
         member_filter: pkg::MemberFilter::only_scripts(),
+        experimental_storage: cmd.build_profile.experimental_storage,
     }
 }

forc-test/src/lib.rs

@@ -106,6 +106,8 @@ pub struct Opts {
     pub error_on_warnings: bool,
     /// Output the time elapsed over each part of the compilation process.
     pub time_phases: bool,
+    /// Enable the experimental storage implementation and UI.
+    pub experimental_storage: bool,
 }
 
 /// The set of options provided for controlling logs printed for each test.
@@ -360,6 +362,7 @@ impl Opts {
             time_phases: self.time_phases,
             tests: true,
             member_filter: Default::default(),
+            experimental_storage: self.experimental_storage,
         }
     }
 }

forc/src/cli/commands/test.rs

@@ -180,5 +180,6 @@ fn opts_from_cmd(cmd: Command) -> forc_test::Opts {
         binary_outfile: cmd.build.output.bin_file,
         debug_outfile: cmd.build.output.debug_file,
         build_target: cmd.build.build_target,
+        experimental_storage: cmd.build.profile.experimental_storage,
     }
 }

forc/src/cli/shared.rs

@@ -49,6 +49,9 @@ pub struct BuildProfile {
     /// Treat warnings as errors.
     #[clap(long)]
     pub error_on_warnings: bool,
+    /// Enable the experimental storage implementation and UI.
+    #[clap(long)]
+    pub experimental_storage: bool,
 }
 
 /// Options related to printing stages of compiler output.

forc/src/ops/forc_build.rs

@@ -38,5 +38,6 @@ fn opts_from_cmd(cmd: BuildCommand) -> pkg::BuildOpts {
         build_target: cmd.build.build_target,
         tests: cmd.tests,
         member_filter: Default::default(),
+        experimental_storage: cmd.build.profile.experimental_storage,
     }
 }

sway-ast/src/item/mod.rs

@@ -79,6 +79,7 @@ pub enum FnArgs {
         self_token: SelfToken,
         ref_self: Option<RefToken>,
         mutable_self: Option<MutToken>,
+        ty: Option<(ColonToken, Ty)>,
         args_opt: Option<(CommaToken, Punctuated<FnArg, CommaToken>)>,
     },
 }

sway-core/src/build_config.rs

@@ -45,6 +45,7 @@ pub struct BuildConfig {
     pub(crate) print_finalized_asm: bool,
     pub(crate) print_ir: bool,
     pub(crate) include_tests: bool,
+    pub(crate) experimental_storage: bool,
 }
 
 impl BuildConfig {
@@ -86,6 +87,7 @@ impl BuildConfig {
             print_finalized_asm: false,
             print_ir: false,
             include_tests: false,
+            experimental_storage: false,
         }
     }
 
@@ -117,6 +119,13 @@ impl BuildConfig {
         }
     }
 
+    pub fn experimental_storage(self, a: bool) -> Self {
+        Self {
+            experimental_storage: a,
+            ..self
+        }
+    }
+
     /// Whether or not to include test functions in parsing, type-checking and codegen.
     ///
     /// This should be set to `true` by invocations like `forc test` or `forc check --tests`.