Merge 63c1a33 into 98dc591

sway-lsp/tests/fixtures/tokens/abi/Forc.toml

@@ -6,7 +6,4 @@ name = "abi"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/consts/Forc.toml

@@ -6,7 +6,4 @@ name = "consts"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/fields/Forc.toml

@@ -6,7 +6,4 @@ name = "fields"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/matches/Forc.toml

@@ -6,7 +6,4 @@ name = "matches"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/paths/Forc.toml

@@ -6,7 +6,4 @@ name = "paths"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/paths/src/deep_mod.sw

@@ -1,3 +1,3 @@
 library;
 
-mod deeper_mod;
+pub mod deeper_mod;

sway-lsp/tests/fixtures/tokens/paths/src/deep_mod/deeper_mod.sw

@@ -8,5 +8,5 @@ pub enum DeepEnum {
 }
 
 pub struct DeepStruct<T> {
-    field: T,
+    pub field: T,
 }

sway-lsp/tests/fixtures/tokens/paths/src/main.sw

@@ -10,9 +10,7 @@ use std::constants::{self, ZERO_B256};
 pub fn fun() {
     let _ = std::option::Option::None;
     let _ = Option::None;
-    let _ = std::vm::evm::evm_address::EvmAddress {
-        value: b256::min(),
-    };
+    let _ = std::vm::evm::evm_address::EvmAddress::zero();
 
     test_mod::test_fun();
     deep_mod::deeper_mod::deep_fun();

sway-lsp/tests/fixtures/tokens/storage/Forc.toml

@@ -6,6 +6,4 @@ name = "storage"
 implicit-std = false
 
 [dependencies]
-# TODO: Temporarily use the local std before the tests dependencies are bumped to v0.54.1.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/structs/Forc.toml

@@ -6,7 +6,4 @@ name = "structs"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/turbofish/Forc.toml

@@ -6,7 +6,4 @@ name = "turbofish"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }

sway-lsp/tests/fixtures/tokens/variables/Forc.toml

@@ -6,7 +6,4 @@ name = "variables"
 implicit-std = false
 
 [dependencies]
-# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
-# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
-# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
-std = { path = "../../../../../sway-lib-std" }
+std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }