Disallow unchecked arithmetic

.github/workflows/ci.yml

@@ -139,7 +139,7 @@ jobs:
           toolchain: stable
           default: true
           target: wasm32-unknown-unknown
-          components: rust-src
+          components: rust-src, clippy
 
       - name: Cache
         uses: Swatinem/rust-cache@v2
@@ -183,7 +183,7 @@ jobs:
           toolchain: stable
           default: true
           target: wasm32-unknown-unknown
-          components: rust-src
+          components: rust-src, clippy
 
       - name: Cache
         uses: Swatinem/rust-cache@v2

crates/build/README.md

@@ -32,7 +32,7 @@ let args = contract_build::ExecuteArgs {
     unstable_flags: UnstableFlags::default(),
     optimization_passes: Some(OptimizationPasses::default()),
     keep_debug_symbols: false,
-    lint: false,
+    dylint: false,
     output_type: OutputType::Json,
     skip_wasm_validation: false,
     target: Target::Wasm,

crates/build/src/args.rs

@@ -120,52 +120,13 @@ impl BuildArtifacts {
     /// Used as output on the cli.
     pub fn steps(&self) -> usize {
         match self {
-            BuildArtifacts::All => 4,
-            BuildArtifacts::CodeOnly => 3,
+            BuildArtifacts::All => 5,
+            BuildArtifacts::CodeOnly => 4,
             BuildArtifacts::CheckOnly => 1,
         }
     }
 }
 
-/// Track and display the current and total number of steps.
-#[derive(Debug, Clone, Copy)]
-pub struct BuildSteps {
-    pub current_step: usize,
-    pub total_steps: Option<usize>,
-}
-
-impl BuildSteps {
-    pub fn new() -> Self {
-        Self {
-            current_step: 1,
-            total_steps: None,
-        }
-    }
-
-    pub fn increment_current(&mut self) {
-        self.current_step += 1;
-    }
-
-    pub fn set_total_steps(&mut self, steps: usize) {
-        self.total_steps = Some(steps)
-    }
-}
-
-impl Default for BuildSteps {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl fmt::Display for BuildSteps {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let total_steps = self
-            .total_steps
-            .map_or("*".to_string(), |steps| steps.to_string());
-        write!(f, "[{}/{}]", self.current_step, total_steps)
-    }
-}
-
 /// The list of targets that ink! supports.
 #[derive(
     Eq,
@@ -199,10 +160,10 @@ impl Target {
     }
 
     /// Target specific flags to be set to `CARGO_ENCODED_RUSTFLAGS` while building.
-    pub fn rustflags(&self) -> &'static str {
+    pub fn rustflags(&self) -> Option<&'static str> {
         match self {
-            Self::Wasm => "-C\x1flink-arg=-zstack-size=65536\x1f-C\x1flink-arg=--import-memory\x1f-Clinker-plugin-lto\x1f-C\x1ftarget-cpu=mvp",
-            Self::RiscV => "-Clinker-plugin-lto",
+            Self::Wasm => Some("-Clink-arg=-zstack-size=65536\x1f-Clink-arg=--import-memory\x1f-Ctarget-cpu=mvp"),
+            Self::RiscV => None,
         }
     }
 

crates/build/src/docker.rs

@@ -86,9 +86,7 @@ use tokio_stream::{
 
 use crate::{
     verbose_eprintln,
-    BuildArtifacts,
     BuildResult,
-    BuildSteps,
     CrateMetadata,
     ExecuteArgs,
     Verbosity,
@@ -119,21 +117,13 @@ pub fn docker_build(args: ExecuteArgs) -> Result<BuildResult> {
         verbosity,
         output_type,
         target,
-        build_artifact,
         image,
         ..
     } = args;
     tokio::runtime::Builder::new_multi_thread()
         .enable_all()
         .build()?
         .block_on(async {
-            let mut build_steps = BuildSteps::new();
-
-            build_steps.set_total_steps(3);
-            if build_artifact == BuildArtifacts::CodeOnly {
-                build_steps.set_total_steps(2);
-            }
-
             let crate_metadata = CrateMetadata::collect(&manifest_path, target)?;
             let host_folder = std::env::current_dir()?;
             let args = compose_build_args()?;
@@ -159,23 +149,19 @@ pub fn docker_build(args: ExecuteArgs) -> Result<BuildResult> {
                 &crate_metadata.contract_artifact_name,
                 &host_folder,
                 &verbosity,
-                &mut build_steps,
             )
             .await?;
 
-            let mut build_result =
-                run_build(&client, &container, &verbosity, &mut build_steps).await?;
+            let mut build_result = run_build(&client, &container, &verbosity).await?;
 
             update_build_result(&host_folder, &mut build_result)?;
 
-            update_metadata(&build_result, &verbosity, &mut build_steps, &image, &client)
-                .await?;
+            update_metadata(&build_result, &verbosity, &image, &client).await?;
 
-            build_steps.increment_current();
             verbose_eprintln!(
                 verbosity,
                 " {} {}",
-                format!("{build_steps}").bold(),
+                "[==]".bold(),
                 "Displaying results".bright_cyan().bold(),
             );
 
@@ -228,7 +214,6 @@ fn update_build_result(host_folder: &Path, build_result: &mut BuildResult) -> Re
 async fn update_metadata(
     build_result: &BuildResult,
     verbosity: &Verbosity,
-    build_steps: &mut BuildSteps,
     build_image: &str,
     client: &Docker,
 ) -> Result<()> {
@@ -250,13 +235,7 @@ async fn update_metadata(
 
         metadata.image = Some(image_tag);
 
-        crate::metadata::write_metadata(
-            metadata_artifacts,
-            metadata,
-            build_steps,
-            verbosity,
-            true,
-        )?;
+        crate::metadata::write_metadata(metadata_artifacts, metadata, verbosity, true)?;
     }
     Ok(())
 }
@@ -287,7 +266,6 @@ async fn create_container(
     contract_name: &str,
     host_folder: &Path,
     verbosity: &Verbosity,
-    build_steps: &mut BuildSteps,
 ) -> Result<String> {
     let entrypoint = vec!["cargo".to_string(), "contract".to_string()];
 
@@ -378,8 +356,7 @@ async fn create_container(
                 }
             ) {
                 // no such image locally, so pull and try again
-                pull_image(client, build_image.to_string(), verbosity, build_steps)
-                    .await?;
+                pull_image(client, build_image.to_string(), verbosity).await?;
                 client
                     .create_container(options, config)
                     .await
@@ -397,7 +374,6 @@ async fn run_build(
     client: &Docker,
     container_name: &str,
     verbosity: &Verbosity,
-    build_steps: &mut BuildSteps,
 ) -> Result<BuildResult> {
     client
         .start_container::<String>(container_name, None)
@@ -418,7 +394,7 @@ async fn run_build(
     verbose_eprintln!(
         verbosity,
         " {} {}",
-        format!("{build_steps}").bold(),
+        "[==]".bold(),
         format!("Started the build inside the container: {}", container_name)
             .bright_cyan()
             .bold(),
@@ -487,12 +463,7 @@ fn compose_build_args() -> Result<Vec<String>> {
 }
 
 /// Pulls the docker image from the registry.
-async fn pull_image(
-    client: &Docker,
-    image: String,
-    verbosity: &Verbosity,
-    build_steps: &mut BuildSteps,
-) -> Result<()> {
+async fn pull_image(client: &Docker, image: String, verbosity: &Verbosity) -> Result<()> {
     let mut pull_image_stream = client.create_image(
         Some(CreateImageOptions {
             from_image: image,
@@ -505,12 +476,11 @@ async fn pull_image(
     verbose_eprintln!(
         verbosity,
         " {} {}",
-        format!("{build_steps}").bold(),
+        "[==]".bold(),
         "Image does not exist. Pulling one from the registry"
             .bright_cyan()
             .bold()
     );
-    build_steps.increment_current();
 
     if verbosity.is_verbose() {
         show_pull_progress(pull_image_stream).await?