Merge branch 'master' into jjcnn/name_clash_struct_def_glob_import

FuelLabs · Jun 11, 2024 · 0fbdb27 · 0fbdb27
2 parents 13a2f9a + ba0d2d7
commit 0fbdb27
Show file tree

Hide file tree

Showing 242 changed files with 11,162 additions and 4,630 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -462,7 +462,7 @@ jobs:
       - name: Install Forc
         run: cargo install --locked --debug --path ./forc
       - name: Run Unit Tests
-        run: forc build --path sway-lib-core && forc test --path sway-lib-core && forc build --path sway-lib-std && forc test --path sway-lib-std
+        run: forc build --path sway-lib-core && forc test --path sway-lib-core && forc build --path sway-lib-std && forc test --path sway-lib-std && forc build --path test/src/in_language_tests & forc test --path test/src/in_language_tests
 
   forc-pkg-fuels-deps-check:
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/book/src/basics/converting_types.md b/docs/book/src/basics/converting_types.md
@@ -37,10 +37,6 @@ Below are some common type conversions in Sway:
 
 ### Convert `str` to `str[]`
 
-```sway
-{{#include ../../../../examples/converting_types/src/strings.sw:strings_import}}
-```
-
 ```sway
 {{#include ../../../../examples/converting_types/src/strings.sw:str_to_str_array}}
 ```
@@ -61,40 +57,24 @@ Below are some common type conversions in Sway:
 
 ### Convert to `u64`
 
-```sway
-{{#include ../../../../examples/converting_types/src/to_u64.sw:to_u64_import}}
-```
-
 ```sway
 {{#include ../../../../examples/converting_types/src/to_u64.sw:to_u64}}
 ```
 
 ### Convert to `u32`
 
-```sway
-{{#include ../../../../examples/converting_types/src/to_u32.sw:to_u32_import}}
-```
-
 ```sway
 {{#include ../../../../examples/converting_types/src/to_u32.sw:to_u32}}
 ```
 
 ### Convert to `u16`
 
-```sway
-{{#include ../../../../examples/converting_types/src/to_u16.sw:to_u16_import}}
-```
-
 ```sway
 {{#include ../../../../examples/converting_types/src/to_u16.sw:to_u16}}
 ```
 
 ### Convert to `u8`
 
-```sway
-{{#include ../../../../examples/converting_types/src/to_u8.sw:to_u8_import}}
-```
-
 ```sway
 {{#include ../../../../examples/converting_types/src/to_u8.sw:to_u8}}
 ```

diff --git a/examples/converting_types/src/strings.sw b/examples/converting_types/src/strings.sw
@@ -1,10 +1,5 @@
 library;
 
-// ANCHOR: strings_import
-use std::primitive_conversions::str::*;
-// ANCHOR_END: strings_import
-
-
 pub fn convert_str_to_str_array() {
     // ANCHOR: str_to_str_array
     let fuel_str: str = "fuel";

diff --git a/examples/converting_types/src/to_u16.sw b/examples/converting_types/src/to_u16.sw
@@ -1,9 +1,5 @@
 library;
 
-// ANCHOR: to_u16_import
-use std::{primitive_conversions::{u16::*, u32::*, u64::*,},};
-// ANCHOR_END: to_u16_import
-
 pub fn convert_uint_to_u16() {
     // Convert any unsigned integer to `u16`
     // ANCHOR: to_u16

diff --git a/examples/converting_types/src/to_u32.sw b/examples/converting_types/src/to_u32.sw
@@ -1,9 +1,5 @@
 library;
 
-// ANCHOR: to_u32_import
-use std::{primitive_conversions::{u32::*, u64::*,},};
-// ANCHOR_END: to_u32_import
-
 pub fn convert_uint_to_u32() {
     // Convert any unsigned integer to `u32`
     // ANCHOR: to_u32

diff --git a/examples/converting_types/src/to_u64.sw b/examples/converting_types/src/to_u64.sw
@@ -1,9 +1,5 @@
 library;
 
-// ANCHOR: to_u64_import
-use std::primitive_conversions::u64::*;
-// ANCHOR_END: to_u64_import
-
 pub fn convert_uint_to_u64() {
     // Convert any unsigned integer to `u64`
     // ANCHOR: to_u64

diff --git a/examples/converting_types/src/to_u8.sw b/examples/converting_types/src/to_u8.sw
@@ -1,9 +1,5 @@
 library;
 
-// ANCHOR: to_u8_import
-use std::{primitive_conversions::{u16::*, u32::*, u64::*, u8::*,},};
-// ANCHOR_END: to_u8_import
-
 pub fn convert_uint_to_u8() {
     // Convert any unsigned integer to `u8`
     // ANCHOR: to_u8

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
@@ -1904,9 +1904,13 @@ pub fn compile(
     if let ProgramABI::Fuel(ref mut program_abi) = program_abi {
         if let Some(ref mut configurables) = program_abi.configurables {
             // Filter out all dead configurables (i.e. ones without offsets in the bytecode)
-            configurables.retain(|c| compiled.config_const_offsets.contains_key(&c.name));
+            configurables.retain(|c| {
+                compiled
+                    .named_data_section_entries_offsets
+                    .contains_key(&c.name)
+            });
             // Set the actual offsets in the JSON object
-            for (config, offset) in compiled.config_const_offsets {
+            for (config, offset) in compiled.named_data_section_entries_offsets {
                 if let Some(idx) = configurables.iter().position(|c| c.name == config) {
                     configurables[idx].offset = offset;
                 }