Merge branch 'master' into many_bugfixes

core_lang/src/parse_tree/return_statement.rs

@@ -5,7 +5,7 @@ use pest::iterators::Pair;
 
 #[derive(Debug, Clone)]
 pub struct ReturnStatement<'sc> {
-    pub(crate) expr: Expression<'sc>,
+    pub expr: Expression<'sc>,
 }
 
 impl<'sc> ReturnStatement<'sc> {

forc/Cargo.toml

@@ -8,18 +8,22 @@ version = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0.41"
 core_lang = {path = "../core_lang"}
+curl = "0.4.38"
+dirs = "3.0.2"
+flate2 = "1.0.20"
 formatter = {path = "../formatter"}
+fuel-asm = {git = "ssh://git@github.com/FuelLabs/fuel-asm.git"}
 fuel-tx = {git = "ssh://git@github.com/FuelLabs/fuel-tx.git"}
 fuel-vm = {git = "ssh://git@github.com/FuelLabs/fuel-vm.git"}
 hex = "0.4.3"
 line-col = "0.2"
-#pest = "2.1"
-fuel-asm = {git = "ssh://git@github.com/FuelLabs/fuel-asm.git"}
 pest = {git = "https://github.com/sezna/pest.git", rev = "8aa58791f759daf4caee26e8560e862df5a6afb7"}
 serde = {version = "1.0", features = ["derive"]}
 source-span = "2.4"
 structopt = "0.3"
+tar = "0.4.35"
 term-table = "1.3"
 termcolor = "1.1"
 toml = "0.5"

forc/src/cli/commands/build.rs

@@ -11,6 +11,11 @@ pub struct Command {
     /// Whether to output a binary file representing the script bytes
     #[structopt(short = "o")]
     pub binary_outfile: Option<String>,
+
+    /// Offline mode, prevents Forc from using the network when managing dependencies.
+    /// Meaning it will only try to use previously downloaded dependencies.
+    #[structopt(long = "offline")]
+    pub offline_mode: bool,
 }
 
 pub(crate) fn exec(command: Command) -> Result<(), String> {

forc/src/cli/commands/deploy.rs

@@ -1,8 +1,14 @@
 use structopt::{self, StructOpt};
 
+use crate::ops::forc_deploy;
+
 #[derive(Debug, StructOpt)]
-pub(crate) struct Command {}
+pub struct Command {}
+
 
-pub(crate) fn exec(_command: Command) -> Result<(), String> {
-    todo!()
-}
+pub(crate) fn exec(command: Command) -> Result<(), String> {
+    match forc_deploy::deploy(command) {
+        Err(e) => Err(e.message),
+        _ => Ok(()),
+    }
+}

forc/src/cli/commands/mvprun.rs

@@ -25,6 +25,7 @@ pub(crate) fn exec(command: Command) -> Result<(), String> {
         path: Some(command.path),
         print_asm: false,
         binary_outfile: None,
+        offline_mode: false,
     };
     match forc_build::build(build_command) {
         Ok(script) => {

forc/src/cli/mod.rs

@@ -10,7 +10,7 @@ use analysis::Command as AnalysisCommand;
 use benchmark::Command as BenchmarkCommand;
 pub use build::Command as BuildCommand;
 use coverage::Command as CoverageCommand;
-use deploy::Command as DeployCommand;
+pub use deploy::Command as DeployCommand;
 pub use format::Command as FormatCommand;
 use init::Command as InitCommand;
 use mvprun::Command as MvprunCommand;