fluencelabs/marine-rs-sdk-test
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine-rs-sdk-test synced 2024-12-04 15:20:18 +00:00
Code Issues Projects Releases Wiki Activity

feat(runtime)!: update marine (#64)

Browse Source 
* update marine

* make clippy happy
This commit is contained in:
Valery Antopol 2023-03-16 21:17:30 +03:00 committed by GitHub
parent c1c4f792e8
commit 68e86c7bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1290 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1782
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

@ -23,7 +23,7 @@ trybuild = "1.0"
[dependencies]
marine-test-macro = { path = "crates/marine-test-macro", version = "=0.8.2" }
marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.8.2" }
fluence-app-service = { version = "0.23.1", features = ["raw-module-api"] }
fluence-app-service = { version = "0.25.0", features = ["raw-module-api"] }
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.93"

4
crates/marine-test-macro-impl/Cargo.toml
View File

@ -14,8 +14,8 @@ license = "Apache-2.0"
all-features = true
[dependencies]
fluence-app-service = { version = "0.23.1", features = ["raw-module-api"] }
marine-it-parser = "0.11.1"
fluence-app-service = { version = "0.25.0", features = ["raw-module-api"] }
marine-it-parser = "0.12.0"
itertools = "0.10.5"
darling = "0.14.3"
quote = "1.0.21"

4
crates/marine-test-macro-impl/src/marine_test/config_utils.rs
View File

@ -44,9 +44,9 @@ pub(crate) fn load_config(
modules_dir: Option<String>,
file_path: &Path,
) -> TResult<ConfigWrapper> {
let config_path_buf = file_path.join(&config_path);
let config_path_buf = file_path.join(config_path);
let marine_config = TomlAppServiceConfig::load(&config_path_buf)?;
let marine_config = TomlAppServiceConfig::load(config_path_buf)?;
let modules_dir = match resolve_modules_dir(&marine_config, modules_dir) {
Some(modules_dir) => modules_dir,
None => return Err(TestGeneratorError::ModulesDirUnspecified),

6
crates/marine-test-macro-impl/src/marine_test/modules_linker.rs
View File

@ -24,7 +24,7 @@ use static_assertions::const_assert;
use std::cmp::Ordering;
use std::collections::HashMap;
use std::hash::Hasher;
use std::rc::Rc;
use std::sync::Arc;
use std::iter::zip;
pub(super) fn link_modules<'modules>(
@ -106,12 +106,12 @@ impl PartialEq for ITypeClosed<'_> {
#[derive(Clone)]
pub struct IRecordTypeClosed<'r> {
pub record_type: Rc<IRecordType>,
pub record_type: Arc<IRecordType>,
pub records: &'r IRecordTypes,
}
impl<'r> IRecordTypeClosed<'r> {
fn new(record_type: Rc<IRecordType>, records: &'r IRecordTypes) -> Self {
fn new(record_type: Arc<IRecordType>, records: &'r IRecordTypes) -> Self {
Self {
record_type,
records,

2
rust-toolchain.toml
View File

@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2022-08-30"
channel = "nightly-2022-12-01"
targets = [ "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "wasm32-wasi" ]
components = ["clippy", "rustfmt"]