Stabilize ABI errors

Stabilize the `error_type` feature.
Fixes #6765

Author: IGI-111

.github/workflows/ci.yml

@@ -478,10 +478,6 @@ jobs:
         run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness
       - name: Cargo Test sway-lib-std
         run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
-      - name: Build All Tests - Experimental Feature 'error_type'
-        run: cargo run --locked --release -p forc -- build --experimental error_type --release --locked --path ./test/src/sdk-harness
-      - name: Cargo Test sway-lib-std - Experimental Feature 'error_type'
-        run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
 
   forc-run-benchmarks:
     runs-on: buildjet-4vcpu-ubuntu-2204
@@ -548,18 +544,10 @@ jobs:
         run: forc test --path sway-lib-std
       - name: Run Std Unit Tests (Release)
         run: forc test --release --path sway-lib-std
-      - name: Run Std Unit Tests - Experimental feature 'error_type' (Debug)
-        run: forc test --experimental error_type --path sway-lib-std
-      - name: Run Std Unit Tests - Experimental feature 'error_type' (Release)
-        run: forc test --release --experimental error_type --path sway-lib-std
       - name: Run In Language Unit Tests (Debug)
         run: forc test --path test/src/in_language_tests
       - name: Run In Language Unit Tests (Release)
         run: forc test --release --path test/src/in_language_tests
-      - name: Run In Language Unit Tests - Experimental feature 'error_type' (Debug)
-        run: forc test --experimental error_type --path test/src/in_language_tests
-      - name: Run In Language Unit Tests - Experimental feature 'error_type' (Release)
-        run: forc test --release --experimental error_type --path test/src/in_language_tests
 
   forc-pkg-fuels-deps-check:
     runs-on: buildjet-4vcpu-ubuntu-2204

forc-pkg/src/pkg.rs

@@ -1775,8 +1775,7 @@ pub fn compile(
 
     const ENCODING_V0: &str = "0";
     const ENCODING_V1: &str = "1";
-    const SPEC_VERSION: &str = "1";
-    const SPEC_VERSION_ERROR_TYPE: &str = "1.1";
+    const SPEC_VERSION: &str = "1.1";
 
     let mut program_abi = match pkg.target {
         BuildTarget::Fuel => {
@@ -1798,11 +1797,7 @@ pub fn compile(
                     } else {
                         ENCODING_V0.into()
                     },
-                    if experimental.error_type {
-                        SPEC_VERSION_ERROR_TYPE.into()
-                    } else {
-                        SPEC_VERSION.into()
-                    }
+                    SPEC_VERSION.into()
                 ),
                 Some(sway_build_config.clone()),
                 metrics

forc-plugins/forc-migrate/src/migrations/mod.rs

@@ -494,7 +494,4 @@ fn assert_migration_steps_consistency(migration_steps: MigrationSteps) {
 
 /// The list of the migration steps, grouped by the Sway feature that causes
 /// the breaking changes behind the migration steps.
-const MIGRATION_STEPS: MigrationSteps = &[(
-    Feature::ErrorType,
-    &[error_type::RENAME_EXISTING_PANIC_IDENTIFIERS_TO_R_PANIC_STEP],
-)];
+const MIGRATION_STEPS: MigrationSteps = &[];

sway-core/src/semantic_analysis/module.rs

@@ -13,7 +13,6 @@ use sway_error::{
     handler::{ErrorEmitted, Handler},
     warning::{CompileWarning, Warning},
 };
-use sway_features::Feature;
 use sway_types::{BaseIdent, Named, SourceId, Span, Spanned};
 
 use crate::{
@@ -27,7 +26,6 @@ use crate::{
     },
     query_engine::{ModuleCacheKey, TypedModuleInfo},
     semantic_analysis::*,
-    transform::AttributeKind,
     BuildConfig, Engines, TypeInfo,
 };
 
@@ -618,44 +616,18 @@ impl ty::TyModule {
 
             // Always auto impl marker traits. If an explicit implementation exists, that will be
             // reported as an error when type-checking trait impls.
-            if ctx.experimental.error_type {
-                let mut ctx = MarkerTraitsAutoImplContext::new(&mut ctx);
-                if let TyAstNodeContent::Declaration(TyDecl::EnumDecl(enum_decl)) = &node.content {
-                    let enum_decl = &*ctx.engines().de().get(&enum_decl.decl_id);
-
-                    let enum_marker_trait_impl =
-                        ctx.generate_enum_marker_trait_impl(engines, enum_decl);
-                    generated.extend(enum_marker_trait_impl);
-
-                    if check_is_valid_error_type_enum(handler, enum_decl).is_ok_and(|res| res) {
-                        let error_type_marker_trait_impl =
-                            ctx.generate_error_type_marker_trait_impl_for_enum(engines, enum_decl);
-                        generated.extend(error_type_marker_trait_impl);
-                    }
-                }
-            } else {
-                // Check for usages of `error_type` and `error` attributes without the feature enabled.
-                if let TyAstNodeContent::Declaration(TyDecl::EnumDecl(enum_decl)) = &node.content {
-                    let enum_decl = &*ctx.engines().de().get(&enum_decl.decl_id);
-                    for attr in enum_decl.attributes.of_kind(AttributeKind::ErrorType) {
-                        handler.emit_err(CompileError::FeatureIsDisabled {
-                            feature: Feature::ErrorType.name().to_string(),
-                            url: Feature::ErrorType.url().to_string(),
-                            span: attr.name.span(),
-                        });
-                    }
-
-                    for attr in enum_decl
-                        .variants
-                        .iter()
-                        .flat_map(|variant| variant.attributes.of_kind(AttributeKind::Error))
-                    {
-                        handler.emit_err(CompileError::FeatureIsDisabled {
-                            feature: Feature::ErrorType.name().to_string(),
-                            url: Feature::ErrorType.url().to_string(),
-                            span: attr.name.span(),
-                        });
-                    }
+            let mut ctx = MarkerTraitsAutoImplContext::new(&mut ctx);
+            if let TyAstNodeContent::Declaration(TyDecl::EnumDecl(enum_decl)) = &node.content {
+                let enum_decl = &*ctx.engines().de().get(&enum_decl.decl_id);
+
+                let enum_marker_trait_impl =
+                    ctx.generate_enum_marker_trait_impl(engines, enum_decl);
+                generated.extend(enum_marker_trait_impl);
+
+                if check_is_valid_error_type_enum(handler, enum_decl).is_ok_and(|res| res) {
+                    let error_type_marker_trait_impl =
+                        ctx.generate_error_type_marker_trait_impl_for_enum(engines, enum_decl);
+                    generated.extend(error_type_marker_trait_impl);
                 }
             }
 

sway-features/src/lib.rs

@@ -169,8 +169,6 @@ features! {
     "https://github.com/FuelLabs/sway/issues/5727",
     references = true,
     "https://github.com/FuelLabs/sway/issues/5063",
-    error_type = false,
-    "https://github.com/FuelLabs/sway/issues/6765",
     const_generics = false,
     "https://github.com/FuelLabs/sway/issues/6860",
 }

sway-lib-std/src/marker.sw

@@ -15,21 +15,17 @@ use ::codec::AbiEncode;
 /// - unit type `()`,
 /// - string slices,
 /// - and enums annotated with the `#[error_type]` attribute.
-#[cfg(experimental_error_type = true)]
 pub trait Error: AbiEncode {
 }
 
 /// A marker for enum types.
-#[cfg(experimental_error_type = true)]
 pub trait Enum {
 }
 
 // Marker traits cannot be explicitly implement in code, except in this module.
 // If a marker trait needs to be implemented for a built-in type, those implementation
 // will be provided here.
 
-#[cfg(experimental_error_type = true)]
 impl Error for str {}
 
-#[cfg(experimental_error_type = true)]
 impl Error for () {}

sway-lib-std/src/prelude.sw

@@ -49,6 +49,5 @@ pub use ::raw_slice::*;
 pub use ::codec::*;
 use ::debug::*;
 pub use ::str::*;
-#[cfg(experimental_error_type = true)]
 pub use ::marker::*;
 pub use ::debug::*;

sway-parse/src/expr/mod.rs

@@ -722,23 +722,21 @@ fn parse_atom(parser: &mut Parser, ctx: ParseExprCtx) -> ParseResult<Expr> {
             expr_opt: Some(expr),
         });
     }
-    if parser.experimental.error_type {
-        if let Some(panic_token) = parser.take() {
-            if parser.is_empty()
-                || parser.peek::<CommaToken>().is_some()
-                || parser.peek::<SemicolonToken>().is_some()
-            {
-                return Ok(Expr::Panic {
-                    panic_token,
-                    expr_opt: None,
-                });
-            }
-            let expr = parser.parse()?;
+    if let Some(panic_token) = parser.take() {
+        if parser.is_empty()
+            || parser.peek::<CommaToken>().is_some()
+            || parser.peek::<SemicolonToken>().is_some()
+        {
             return Ok(Expr::Panic {
                 panic_token,
-                expr_opt: Some(expr),
+                expr_opt: None,
             });
         }
+        let expr = parser.parse()?;
+        return Ok(Expr::Panic {
+            panic_token,
+            expr_opt: Some(expr),
+        });
     }
     if let Some(if_expr) = parser.guarded_parse::<IfToken, _>()? {
         return Ok(Expr::If(if_expr));

sway-parse/src/keywords.rs

@@ -192,7 +192,5 @@ pub const RESERVED_KEYWORDS: phf::Set<&'static str> = phf::phf_set! {
     "continue",
     "configurable",
     "type",
-    // TODO: Add `panic` to the list of reserved keywords,
-    //       once `error_type` feature is not experimental anymore.
-    // "panic",
+    "panic",
 };

sway-parse/src/parse.rs

@@ -146,8 +146,7 @@ impl Parse for Ident {
                 }
 
                 if !ident.is_raw_ident()
-                    && (RESERVED_KEYWORDS.contains(ident_str)
-                        || (parser.experimental.error_type && ident_str == PanicToken::AS_STR))
+                    && (RESERVED_KEYWORDS.contains(ident_str) || ident_str == PanicToken::AS_STR)
                 {
                     return Err(parser.emit_error_with_span(
                         ParseErrorKind::ReservedKeywordIdentifier,

test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-assert/src/prelude.sw

@@ -19,5 +19,4 @@ pub use ::raw_ptr::*;
 pub use ::raw_slice::*;
 pub use ::codec::*;
 pub use ::str::*;
-#[cfg(experimental_error_type = true)]
-pub use ::marker::*;
+pub use ::marker::*;

test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-conversions/src/prelude.sw

@@ -36,5 +36,4 @@ pub use ::raw_ptr::*;
 pub use ::raw_slice::*;
 pub use ::codec::*;
 pub use ::str::*;
-#[cfg(experimental_error_type = true)]
 pub use ::marker::*;

test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core/src/prelude.sw

@@ -12,6 +12,5 @@ pub use ::raw_ptr::*;
 pub use ::raw_slice::*;
 pub use ::codec::*;
 pub use ::str::*;
-#[cfg(experimental_error_type = true)]
 pub use ::marker::*;
 pub use ::debug::*;

test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-option-result/src/prelude.sw

@@ -21,5 +21,4 @@ pub use ::raw_ptr::*;
 pub use ::raw_slice::*;
 pub use ::codec::*;
 pub use ::str::*;
-#[cfg(experimental_error_type = true)]
 pub use ::marker::*;

test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-vec/src/prelude.sw

@@ -28,5 +28,4 @@ pub use ::raw_ptr::*;
 pub use ::raw_slice::*;
 pub use ::codec::*;
 pub use ::str::*;
-#[cfg(experimental_error_type = true)]
 pub use ::marker::*;

test/src/e2e_vm_tests/test_programs/should_fail/attributes_error_type_and_error/snapshot.toml

@@ -1,4 +1,4 @@
 cmds = [
-    "forc build --path {root} --release --experimental error_type",
     "forc build --path {root} --release",
-]
+    "forc build --path {root} --release",
+]