Merge std and core libraries

.github/CODEOWNERS

@@ -6,7 +6,6 @@
 
 # Sway files and standard library
 /examples/ @FuelLabs/sway-compiler @FuelLabs/swayex 
-/sway-lib-core/ @FuelLabs/sway-compiler @FuelLabs/swayex
 /sway-lib-std/ @FuelLabs/sway-compiler @FuelLabs/swayex
 
 # Tooling

.github/workflows/ci.yml

@@ -21,11 +21,9 @@ env:
 jobs:
   verifications-complete:
     needs:
-      - build-sway-lib-core
       - build-sway-lib-std
       - build-sway-examples
       - build-reference-examples
-      - forc-fmt-check-sway-lib-core
       - forc-fmt-check-sway-lib-std
       - forc-fmt-check-sway-examples
       - forc-fmt-check-panic
@@ -76,22 +74,6 @@ jobs:
           version=$(toml get Cargo.toml workspace.dependencies.fuel-core-client.version | tr -d '"')
           echo "version=$version" >> "$GITHUB_OUTPUT"
 
-  build-sway-lib-core:
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-provider: "buildjet"
-      - name: Install Forc
-        run: cargo install --locked --debug --path ./forc
-      - name: Build sway-lib-core
-        run: forc build --path sway-lib-core
-
   build-sway-lib-std:
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
@@ -136,20 +118,6 @@ jobs:
       - name: Build Sway examples workspace
         run: cargo run --locked -p forc -- build --locked --path ./docs/reference/src/code/Forc.toml
 
-  forc-fmt-check-sway-lib-core:
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-provider: "buildjet"
-      - name: Check Sway sway-lib-core formatting
-        run: cargo run --locked -p forc-fmt -- --check --path ./sway-lib-core
-
   forc-fmt-check-sway-lib-std:
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
@@ -551,16 +519,6 @@ jobs:
           cache-provider: "buildjet"
       - name: Install Forc
         run: cargo install --locked --debug --path ./forc
-      - name: Run Core Unit Tests
-        run: forc build --path sway-lib-core && forc test --path sway-lib-core
-      - name: Run Core Unit Tests - Experimental feature 'storage_domains'
-        run: forc build --experimental storage_domains --path sway-lib-core && forc test --experimental storage_domains --path sway-lib-core
-      - name: Run Core Unit Tests - Experimental feature 'error_type'
-        run: forc build --experimental error_type --path sway-lib-core && forc test --experimental error_type --path sway-lib-core
-      - name: Run Core Unit Tests - Experimental feature 'partial_eq'
-        run: forc build --experimental partial_eq --path sway-lib-core && forc test --experimental partial_eq --path sway-lib-core
-      - name: Run Core Unit Tests - Experimental feature 'try_from_bytes_for_b256'
-        run: forc build --experimental try_from_bytes_for_b256 --path sway-lib-core && forc test --experimental try_from_bytes_for_b256 --path sway-lib-core
       - name: Run Std Unit Tests
         run: forc build --path sway-lib-std && forc test --path sway-lib-std
       - name: Run Std Unit Tests - Experimental feature 'storage_domains'
@@ -742,7 +700,6 @@ jobs:
       [
         build-forc-test-project,
         build-sway-examples,
-        build-sway-lib-core,
         build-sway-lib-std,
         cargo-build-workspace,
         cargo-clippy,
@@ -807,7 +764,6 @@ jobs:
       [
         build-forc-test-project,
         build-sway-examples,
-        build-sway-lib-core,
         build-sway-lib-std,
         cargo-build-workspace,
         cargo-clippy,
@@ -856,7 +812,6 @@ jobs:
       [
         build-forc-test-project,
         build-sway-examples,
-        build-sway-lib-core,
         build-sway-lib-std,
         cargo-build-workspace,
         cargo-clippy,

.gitignore

@@ -9,8 +9,7 @@ target
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-# `core` and `std` are libs, no need to commit their lock files.
-sway-lib-core/Forc.lock
+# `std` is a lib, no need to commit its lock file.
 sway-lib-std/Forc.lock
 
 # Forc's build directory

ci_checks.sh

@@ -31,8 +31,6 @@ cargo install --locked --debug --path ./forc-plugins/forc-client &&
 cargo install --locked --debug --path ./forc-plugins/forc-tx &&
 cargo install --locked --debug forc-explore &&
 cargo install --locked --debug --path ./scripts/mdbook-forc-documenter &&
-forc build --path sway-lib-core &&
-forc test --path sway-lib-core &&
 forc build --path sway-lib-std &&
 forc test --path sway-lib-std &&
 cargo run --locked -p forc -- build --locked --path ./examples/Forc.toml &&

docs/book/spell-check-custom-words.txt

@@ -13,6 +13,7 @@ BrowserStack
 CLI
 Deserialization
 deserializing
+deserialization
 DApp
 intrinsics
 Intrinsics

docs/book/src/SUMMARY.md

@@ -7,7 +7,6 @@
   - [The Fuel Toolchain](./introduction/fuel_toolchain.md)
   - [A Forc Project](./introduction/forc_project.md)
   - [Standard Library](./introduction/standard_library.md)
-  - [Core Library](./introduction/core_library.md)
   - [Sway Language Standards](./introduction/sway_standards.md)
 - [Examples](./examples/index.md)
   - [Counter](./examples/counter.md)

docs/book/src/advanced/traits.md

@@ -35,7 +35,7 @@ The above snippet declares all of the methods in the trait `Compare` for the typ
 ## Supertraits
 
 When using multiple traits, scenarios often come up where one trait may require functionality from another trait. This is where supertraits come in as they allow you to require a trait when implementing another trait, i.e., a trait with a trait.
-A good example of this is the `Ord` trait of the `core` library of Sway. The `Ord` trait requires the `Eq` trait, so `Eq` is kept as a separate trait as one may decide to implement `Eq`
+A good example of this is the `Ord` trait of the `std` library of Sway. The `Ord` trait requires the `Eq` trait, so `Eq` is kept as a separate trait as one may decide to implement `Eq`
 without implementing other parts of the `Ord` trait.
 
 ```sway
@@ -169,7 +169,7 @@ fn panic_with_error<E>(err: E) where E: Error {
 
 > **Note** `panic` expression and error types [have not yet been implemented](https://github.com/FuelLabs/sway/issues/6765)
 
-All marker traits are defined in the `core::marker` module.
+All marker traits are defined in the `std::marker` module.
 
 ## Use Cases
 

docs/book/src/forc/manifest_reference.md

@@ -238,7 +238,7 @@ In the example above, `std` is patched with the `test` branch from `std` repo. Y
 std = { path = "/path/to/local_std_version" }
 ```
 
-Just like `std` or `core` you can also patch dependencies you declared with a git repo.
+Just like `std` you can also patch dependencies you declared with a git repo.
 
 ```toml
 [project]

docs/book/src/introduction/index.md

@@ -6,5 +6,4 @@ To get started with Forc and Sway smart contract development, install the Fuel t
 - [The Fuel Toolchain](./fuel_toolchain.md)
 - [A Forc Project](./forc_project.md)
 - [Standard Library](./standard_library.md)
-- [Core Library](./core_library.md)
 - [Sway Language Standards](./sway_standards.md)

docs/book/src/introduction/standard_library.md

@@ -35,7 +35,7 @@ The current version of the prelude lives in [`std::prelude`](https://github.com/
 - [`std::contract_id::ContractId`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/contract_id.sw), a wrapper around the `b256` type representing the ID of a contract.
 - [`std::identity::Identity`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/identity.sw), an enum with two possible variants: `Address: Address` and `ContractId: ContractId`.
 - [`std::vec::Vec`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/vec.sw), a growable, heap-allocated vector.
-- [`std::storage::storage_key::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/storage/storage_key.sw), contains the API for accessing a `core::storage::StorageKey` which describes a location in storage.
+- [`std::storage::storage_key::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/storage/storage_key.sw), contains the API for accessing a `std::storage::StorageKey` which describes a location in storage.
 - [`std::storage::storage_map::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/storage/storage_map.sw), a key-value mapping in contract storage.
 - [`std::option::Option`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/option.sw), an enum which expresses the presence or absence of a value.
 - [`std::result::Result`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/result.sw), an enum for functions that may succeed or fail.
@@ -46,4 +46,11 @@ The current version of the prelude lives in [`std::prelude`](https://github.com/
 - [`std::revert::revert`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/revert.sw), a function that reverts the VM.
 - [`std::logging::log`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/logging.sw), a function that logs arbitrary stack types.
 - [`std::auth::msg_sender`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/auth.sw), a function that gets the `Identity` from which a call was made.
+- [`std::primitives::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/primitives.sw), methods on primitive types.
+- [`std::primitive_conversions::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/primitive_conversions.sw), methods for converting between primitive types.
+- [`std::raw_ptr::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/raw_ptr.sw), functions for working with raw pointers.
+- [`std::raw_slice::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/raw_slice.sw), functions for working with raw slices.
+- [`std::ops::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/ops.sw), mathematical operations such as addition, subtraction, multiplication, and division.
+- [`std::str::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/str.sw), methods for working with strings.
+- [`std::codec::*`](https://github.com/FuelLabs/sway/blob/master/sway-lib-std/src/codec.sw), automatic serialization and deserialization of types.
 <!-- prelude:example:end -->

docs/book/src/testing/testing-with-rust.md

@@ -98,10 +98,8 @@ ABI, storage and bytecode artifacts are available. We can do so with `forc build
 ```console
 $ forc build
   Creating a new `Forc.lock` file. (Cause: lock file did not exist)
-    Adding core
     Adding std git+https://github.com/fuellabs/sway?tag=v0.24.5#e695606d8884a18664f6231681333a784e623bc9
    Created new lock file at /home/user/path/to/my-fuel-project/Forc.lock
-  Compiled library "core".
   Compiled library "std".
   Compiled contract "my-fuel-project".
   Bytecode size is 60 bytes.

docs/book/src/testing/unit-testing.md

@@ -33,7 +33,6 @@ forc test
 The output should look similar to this:
 
 ```console
-  Compiled library "core".
   Compiled library "std".
   Compiled library "lib_single_test".
   Bytecode size is 92 bytes.

docs/reference/src/code/Forc.lock

@@ -70,10 +70,6 @@ name = "control_flow"
 source = "member"
 dependencies = ["std"]
 
-[[package]]
-name = "core"
-source = "path+from-root-0F28276288D2432C"
-
 [[package]]
 name = "counter"
 source = "member"
@@ -127,10 +123,7 @@ dependencies = ["std"]
 [[package]]
 name = "intermediate_variables"
 source = "member"
-dependencies = [
-    "core",
-    "std",
-]
+dependencies = ["std"]
 
 [[package]]
 name = "letter_casing"
@@ -163,10 +156,7 @@ dependencies = ["std"]
 [[package]]
 name = "namespace"
 source = "member"
-dependencies = [
-    "core",
-    "std",
-]
+dependencies = ["std"]
 
 [[package]]
 name = "numerics"
@@ -201,7 +191,6 @@ dependencies = ["std"]
 [[package]]
 name = "std"
 source = "path+from-root-0F28276288D2432C"
-dependencies = ["core"]
 
 [[package]]
 name = "storage_init"

docs/reference/src/code/language/control_flow/src/lib.sw

@@ -151,8 +151,6 @@ fn nested_match(input: TopLevel) -> u64 {
 // ANCHOR_END: nested_enum_match
 
 // ANCHOR: complex_multi_arg_enum_match
-use core::ops::Eq;
-
 enum Binary {
     True: (),
     False: (),

docs/reference/src/code/language/style-guide/intermediate_variables/Forc.toml

@@ -5,5 +5,4 @@ license = "Apache-2.0"
 name = "intermediate_variables"
 
 [dependencies]
-core = { path = "../../../../../../../sway-lib-core" }
 std = { path = "../../../../../../../sway-lib-std" }

docs/reference/src/code/operations/namespace/Forc.toml

@@ -5,5 +5,4 @@ license = "Apache-2.0"
 name = "namespace"
 
 [dependencies]
-core = { path = "../../../../../../sway-lib-core" }
 std = { path = "../../../../../../sway-lib-std" }

docs/slides/encoding.md

@@ -31,7 +31,7 @@ contract.some_method(0);
 Compiler will desugar this into
 
 ```rust
-core::codec::contract_call(
+std::codec::contract_call(
     CONTRACT_ID,
     "some_method",
     (0,),
@@ -108,9 +108,9 @@ Compiler will desugar this into:
 
 ```rust
 pub fn __entry() {
-    let method_name = core::codec::decode_first_param::<str>();
+    let method_name = std::codec::decode_first_param::<str>();
     if method_name == "some_method" {
-        let mut buffer = core::codec::BufferReader::from_second_parameter();
+        let mut buffer = std::codec::BufferReader::from_second_parameter();
         let args: (u64,) = buffer.decode::<(u64,)>();
         let result: () = __contract_entry_some_method(args.0);
         let result: raw_slice = encode::<()>(result);
@@ -398,7 +398,7 @@ will be desugared into something like
 const SOMETHING: u64;
 
 fn __entry() -> raw_slice {
-    core::codec::abi_decode_in_place(&mut SOMETHING, 7104, 8);
+    std::codec::abi_decode_in_place(&mut SOMETHING, 7104, 8);
     encode(main())
 }