Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: support sync rust #760

Merged
merged 18 commits into from
Jan 22, 2025
Merged

chore: support sync rust #760

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
795d6a7
chore: support sync rust
ajewellamz Jan 13, 2025
c9d0aac
m
ajewellamz Jan 13, 2025
f2c3db7
resources should be send and sync
ajewellamz Jan 16, 2025
b69c189
m
ajewellamz Jan 21, 2025
81c2f60
m
ajewellamz Jan 22, 2025
aff0a07
Merge branch 'main-1.x' into ajewell/sync-rust
ajewellamz Jan 22, 2025
a15f8fe
m
ajewellamz Jan 22, 2025
8bf4120
m
ajewellamz Jan 22, 2025
ad37c63
m
ajewellamz Jan 22, 2025
fc0eab0
m
ajewellamz Jan 22, 2025
dfbeef5
m
ajewellamz Jan 22, 2025
53775a3
m
ajewellamz Jan 22, 2025
8b0fa49
m
ajewellamz Jan 22, 2025
5e8fd01
m
ajewellamz Jan 22, 2025
6a60240
m
ajewellamz Jan 22, 2025
89aed9c
m
ajewellamz Jan 22, 2025
c9e3b04
m
ajewellamz Jan 22, 2025
b2ffdbd
m
ajewellamz Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
# Rust code generation is under development and depends on pending changes to the
# Dafny Rust code generation, so we test on a specific unreleased commit instead.
dafny-version:
- 5f2330113320f2af0476473fd267b5b547f94cba
- d07403b6d6606257e1b5aada4d0156901f4a17de
uses: ./.github/workflows/test_models_rust_tests.yml
with:
dafny: ${{ matrix.dafny-version }}
Expand Down
4 changes: 2 additions & 2 deletions SmithyDafnyMakefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ transpile_implementation_rust: SRC_INDEX=$(RUST_SRC_INDEX)
transpile_implementation_rust: TEST_INDEX=$(RUST_TEST_INDEX)
# The Dafny Rust code generator is not complete yet,
# so we want to emit code even if there are unsupported features in the input.
transpile_implementation_rust: DAFNY_OPTIONS=--emit-uncompilable-code --allow-warnings --compile-suffix --rust-module-name implementation_from_dafny
transpile_implementation_rust: DAFNY_OPTIONS=--emit-uncompilable-code --allow-warnings --compile-suffix --rust-module-name implementation_from_dafny --rust-sync
# The Dafny Rust code generator only supports a single crate for everything,
# so we inline all dependencies by not passing `-library` to Dafny.
transpile_implementation_rust: TRANSPILE_DEPENDENCIES=
Expand Down Expand Up @@ -776,7 +776,7 @@ local_transpile_impl_rust_single: TARGET=rs
local_transpile_impl_rust_single: OUT=implementation_from_dafny
local_transpile_impl_rust_single: SRC_INDEX=$(RUST_SRC_INDEX)
local_transpile_impl_rust_single: TEST_INDEX=$(RUST_TEST_INDEX)
local_transpile_impl_rust_single: DAFNY_OPTIONS=--emit-uncompilable-code --allow-warnings --compile-suffix
local_transpile_impl_rust_single: DAFNY_OPTIONS=--emit-uncompilable-code --allow-warnings --compile-suffix --rust-sync
local_transpile_impl_rust_single: TRANSPILE_DEPENDENCIES=
local_transpile_impl_rust_single: STD_LIBRARY=
local_transpile_impl_rust_single: SRC_INDEX_TRANSPILE=$(if $(SRC_INDEX),$(SRC_INDEX),src)
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Aggregate/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
simple_aggregate = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/CallingAWSSDKFromLocalService/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ aws-config = "1.5.8"
aws-smithy-runtime = {version = "1.7.1", features=["client"]}
aws-smithy-runtime-api = {version = "1.7.2", features=["client"]}
aws-smithy-types = "1.2.4"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}
aws-sdk-dynamodb = "1.50.0"
aws-sdk-kms = "1.47.0"

Expand Down
6 changes: 3 additions & 3 deletions TestModels/CallingAWSSDKFromLocalService/runtimes/rust/src/ddb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ static DAFNY_TOKIO_RUNTIME: LazyLock<tokio::runtime::Runtime> = LazyLock::new(||

#[allow(non_snake_case)]
impl crate::r#software::amazon::cryptography::services::dynamodb::internaldafny::_default {
pub fn DynamoDBClient() -> ::std::rc::Rc<
pub fn DynamoDBClient() -> ::dafny_runtime::Rc<
crate::r#_Wrappers_Compile::Result<
::dafny_runtime::Object<dyn crate::r#software::amazon::cryptography::services::dynamodb::internaldafny::types::IDynamoDBClient>,
::std::rc::Rc<crate::r#software::amazon::cryptography::services::dynamodb::internaldafny::types::Error>
::dafny_runtime::Rc<crate::r#software::amazon::cryptography::services::dynamodb::internaldafny::types::Error>
>
>{
let shared_config = match tokio::runtime::Handle::try_current() {
Expand All @@ -36,7 +36,7 @@ impl crate::r#software::amazon::cryptography::services::dynamodb::internaldafny:
let inner = aws_sdk_dynamodb::Client::new(&shared_config);
let client = crate::deps::com_amazonaws_dynamodb::client::Client { inner };
let dafny_client = ::dafny_runtime::upcast_object()(::dafny_runtime::object::new(client));
std::rc::Rc::new(crate::r#_Wrappers_Compile::Result::Success {
dafny_runtime::Rc::new(crate::r#_Wrappers_Compile::Result::Success {
value: dafny_client,
})
}
Expand Down
4 changes: 2 additions & 2 deletions TestModels/CallingAWSSDKFromLocalService/runtimes/rust/src/kms.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static DAFNY_TOKIO_RUNTIME: LazyLock<tokio::runtime::Runtime> = LazyLock::new(||

impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_default {
#[allow(non_snake_case)]
pub fn KMSClient() -> ::std::rc::Rc<crate::r#_Wrappers_Compile::Result<::dafny_runtime::Object<dyn crate::software::amazon::cryptography::services::kms::internaldafny::types::IKMSClient>, ::std::rc::Rc<crate::software::amazon::cryptography::services::kms::internaldafny::types::Error>>>{
pub fn KMSClient() -> ::dafny_runtime::Rc<crate::r#_Wrappers_Compile::Result<::dafny_runtime::Object<dyn crate::software::amazon::cryptography::services::kms::internaldafny::types::IKMSClient>, ::dafny_runtime::Rc<crate::software::amazon::cryptography::services::kms::internaldafny::types::Error>>>{
let shared_config = match tokio::runtime::Handle::try_current() {
Ok(curr) => tokio::task::block_in_place(|| {
curr.block_on(async {
Expand All @@ -32,7 +32,7 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
let inner = aws_sdk_kms::Client::new(&shared_config);
let client = crate::deps::com_amazonaws_kms::client::Client { inner };
let dafny_client = ::dafny_runtime::upcast_object()(::dafny_runtime::object::new(client));
std::rc::Rc::new(crate::r#_Wrappers_Compile::Result::Success {
dafny_runtime::Rc::new(crate::r#_Wrappers_Compile::Result::Success {
value: dafny_client,
})
}
Expand Down
14 changes: 7 additions & 7 deletions TestModels/CallingAWSSDKFromLocalService/runtimes/rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![allow(
deprecated,
non_upper_case_globals,
unused,
non_snake_case,
non_camel_case_types
deprecated,
non_upper_case_globals,
unused,
non_snake_case,
non_camel_case_types
)]

pub mod client;
Expand All @@ -14,10 +14,10 @@ pub mod error;
pub(crate) mod implementation_from_dafny;
/// All operations that this crate can perform.
pub mod operation;
pub mod validation;
mod standard_library_conversions;
mod standard_library_externs;
pub mod types;
pub mod validation;
pub mod wrapped;
pub(crate) use crate::implementation_from_dafny::r#_Wrappers_Compile;
pub(crate) use crate::implementation_from_dafny::simple;
Expand All @@ -30,4 +30,4 @@ pub use crate::deps::com_amazonaws_kms;
pub mod ddb;
pub mod kms;

pub(crate) use crate::implementation_from_dafny::software;
pub(crate) use crate::implementation_from_dafny::software;
2 changes: 1 addition & 1 deletion TestModels/Constraints/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.7.1", features=["client"]}
aws-smithy-runtime-api = {version = "1.7.2", features=["client"]}
aws-smithy-types = "1.2.4"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dependencies.tokio]
version = "1.26.0"
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Constructor/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ wrapped-client = []
[dependencies]
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
constructor = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Dependencies/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ wrapped-client = []
[dependencies]
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
dependencies = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Documentation/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
documentation = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Errors/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.7.1", features=["client"]}
aws-smithy-runtime-api = {version = "1.7.2", features=["client"]}
aws-smithy-types = "1.2.4"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dependencies.tokio]
version = "1.26.0"
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Extendable/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.7.1", features=["client"]}
aws-smithy-runtime-api = {version = "1.7.2", features=["client"]}
aws-smithy-types = "1.2.4"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dependencies.tokio]
version = "1.26.0"
Expand Down
6 changes: 3 additions & 3 deletions TestModels/Extendable/runtimes/rust/src/factory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::simple::extendable::resources::internaldafny::types::GetExtendableRes
use crate::simple::extendable::resources::internaldafny::types::GetExtendableResourceErrorsInput;
use crate::simple::extendable::resources::internaldafny::types::GetExtendableResourceErrorsOutput;
use crate::simple::extendable::resources::internaldafny::types::IExtendableResource;
use std::rc::Rc;
use ::dafny_runtime::Rc;

pub mod simple {
pub mod extendable {
Expand All @@ -30,8 +30,8 @@ pub struct NativeResource {
pub inner: Box<dyn IExtendableResource>,
}

impl dafny_runtime::UpcastObject<dyn std::any::Any> for NativeResource {
dafny_runtime::UpcastObjectFn!(dyn std::any::Any);
impl dafny_runtime::UpcastObject<::dafny_runtime::DynAny> for NativeResource {
dafny_runtime::UpcastObjectFn!(::dafny_runtime::DynAny);
}

impl IExtendableResource for NativeResource {
Expand Down
4 changes: 2 additions & 2 deletions TestModels/Extendable/runtimes/rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ pub mod conversions;
pub mod deps;
/// Common errors and error handling utilities.
pub mod error;
pub mod factory;
pub(crate) mod implementation_from_dafny;
/// All operations that this crate can perform.
pub mod operation;
pub mod validation;
mod standard_library_conversions;
mod standard_library_externs;
pub mod types;
pub mod validation;
pub mod wrapped;
pub mod factory;
pub(crate) use crate::implementation_from_dafny::_SimpleExtendableResourcesTest_Compile;
pub(crate) use crate::implementation_from_dafny::_WrappedTest_Compile;
pub(crate) use crate::implementation_from_dafny::_Wrappers_Compile;
Expand Down
2 changes: 1 addition & 1 deletion TestModels/LanguageSpecificLogic/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
language_specific_logic = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/LocalService/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
local_service = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/MultipleModels/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ wrapped-client = []
[dependencies]
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
multiple_models = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/OrphanedShapes/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
simple_orphaned = { path = ".", features = ["wrapped-client"] }
Expand Down
7 changes: 4 additions & 3 deletions TestModels/OrphanedShapes/runtimes/rust/src/extern_definitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

use crate::r#_Wrappers_Compile::Result;
use dafny_runtime::rcmut;
use dafny_runtime::Rc;
use std::cell::UnsafeCell;
use std::rc::Rc;

pub mod internal_ExternDefinitions_Compile {

Expand All @@ -14,6 +14,7 @@ pub mod internal_ExternDefinitions_Compile {
use crate::simple::orphaned::internaldafny::types as internaldafny_types;
use crate::simple::orphaned::internaldafny::types::*;
use crate::types::*;
use dafny_runtime::Rc;

impl _default {
pub fn InitializeOrphanedStructure(
Expand All @@ -37,7 +38,7 @@ pub mod internal_ExternDefinitions_Compile {
{
let native_resource_ref =
crate::conversions::orphaned_resource::from_dafny(dafny_resource.clone());
let native_resource = native_resource_ref.inner.borrow();
let native_resource = native_resource_ref.inner.lock().unwrap();
let native_output = native_resource.orphaned_resource_operation(
crate::operation::orphaned_resource_operation::OrphanedResourceOperationInput {
some_string: std::option::Option::Some(
Expand All @@ -52,7 +53,7 @@ pub mod internal_ExternDefinitions_Compile {
native_output.unwrap(),
);

::std::rc::Rc::new(Result::<
Rc::new(Result::<
Rc<internaldafny_types::OrphanedResourceOperationOutput>,
Rc<Error>,
>::Success {
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Positional/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
positional = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Refinement/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies.tokio]
version = "1.26.0"
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Resource/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
simple_resources = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/Resource/runtimes/rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ pub mod error;
pub(crate) mod implementation_from_dafny;
/// All operations that this crate can perform.
pub mod operation;
pub mod validation;
mod standard_library_conversions;
mod standard_library_externs;
pub mod types;
pub mod validation;
pub mod wrapped;
pub(crate) use crate::implementation_from_dafny::r#_Wrappers_Compile;
pub(crate) use crate::implementation_from_dafny::simple;
Expand Down
21 changes: 17 additions & 4 deletions TestModels/Resource/runtimes/rust/tests/simple_resources_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use simple_resources::types::simple_resource::SimpleResourceRef;
use simple_resources::operation::get_resource_data::*;
use simple_resources::types::simple_resource::SimpleResourceRef;
use simple_resources::*;

#[tokio::test]
Expand All @@ -22,13 +22,23 @@ async fn TestClient(config: SimpleResourcesConfig) {

async fn TestNoneGetData(config: SimpleResourcesConfig, resource: SimpleResourceRef) {
let input = allNone();
let result = resource.inner.borrow_mut().get_resource_data(input).unwrap();
let result = resource
.inner
.lock()
.unwrap()
.get_resource_data(input)
Comment on lines +25 to +28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not blocking on this PR, but I think we should really have resource operations defined on the resource ref structs as well, so customers doesn't have to mess with internal things. borrow_mut() wasn't great before in terms of encapsulation and now it's a bit worse.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would be very helpful. Especially if we could then make inner private.
Should the be an issue or a sim or something?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#771

.unwrap();
checkMostNone(config.name().clone().unwrap().to_string(), result);
}

async fn TestSomeGetData(config: SimpleResourcesConfig, resource: SimpleResourceRef) {
let input: GetResourceDataInput = allSome();
let result = resource.inner.borrow_mut().get_resource_data(input).unwrap();
let result = resource
.inner
.lock()
.unwrap()
.get_resource_data(input)
.unwrap();
checkSome(config.name().clone().unwrap().to_string(), result);
}

Expand Down Expand Up @@ -67,7 +77,10 @@ pub fn allSome() -> GetResourceDataInput {

pub fn checkSome(name: String, output: GetResourceDataOutput) {
assert_eq!(Some(name + " Some"), *output.string_value());
assert_eq!(Some(aws_smithy_types::Blob::new(vec![1u8])), *output.blob_value());
assert_eq!(
Some(aws_smithy_types::Blob::new(vec![1u8])),
*output.blob_value()
);
assert_eq!(Some(true), *output.boolean_value());
assert_eq!(Some(1), *output.integer_value());
assert_eq!(Some(1), *output.long_value());
Expand Down
2 changes: 1 addition & 1 deletion TestModels/SQSExtended/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
# TODO: Wrong path according to the tutorial instructions
dafny_runtime = { path = "../../../../../TestModels/dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../../../TestModels/dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
extended_sqs = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/SimpleTypes/SimpleBlob/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
simple_blob = { path = ".", features = ["wrapped-client"] }
Expand Down
2 changes: 1 addition & 1 deletion TestModels/SimpleTypes/SimpleBoolean/runtimes/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ wrapped-client = []
aws-smithy-runtime = {version = "1.6.0", features = ["client"] }
aws-smithy-runtime-api = {version = "1.7.0", features = ["client"] }
aws-smithy-types = "1.2.0"
dafny_runtime = { path = "../../../../dafny-dependencies/dafny_runtime_rust"}
dafny_runtime = { path = "../../../../dafny-dependencies/dafny_runtime_rust", features = ["sync"]}

[dev-dependencies]
simple_boolean = { path = ".", features = ["wrapped-client"] }
Expand Down
Loading
Loading