Dreaded_X/automation_rs
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

No more cast_mut()

Browse Source
This commit is contained in:
Dreaded_X
2024-07-26 00:37:53 +02:00
parent 6c797820dc
commit 3fd8dddeb2
7 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
google_home/google_home/src/device.rs
View File

@@ -56,7 +56,7 @@ pub trait Device: DeviceFulfillment {
device
}
async fn execute(&mut self, command: Command) -> Result<(), ErrorCode> {
async fn execute(&self, command: Command) -> Result<(), ErrorCode> {
DeviceFulfillment::execute(self, command.clone())
.await
.unwrap();

2
google_home/google_home/src/fulfillment.rs
View File

@@ -138,7 +138,7 @@ impl GoogleHome {
let execution = command.execution.clone();
async move {
if let Some(device) = devices.get(id.as_str())
&& let Some(device) = device.write().await.as_mut().cast_mut()
&& let Some(device) = device.write().await.as_ref().cast()
{
if !device.is_online() {
return (id, Ok(false));

6
google_home/google_home_macro/src/lib.rs
View File

@@ -501,7 +501,7 @@ pub fn traits(item: TokenStream) -> TokenStream {
Some(quote! {
Command::#command_name {#(#parameters,)*} => {
if let Some(t) = self.cast_mut() as Option<&mut dyn #ident> {
if let Some(t) = self.cast() as Option<&dyn #ident> {
t.#f_name(#(#parameters,)*) #asyncness #errors;
serde_json::to_value(t.get_state().await?)?
} else {
@@ -528,7 +528,7 @@ pub fn traits(item: TokenStream) -> TokenStream {
pub trait #fulfillment: Sync + Send {
async fn sync(&self) -> Result<(Vec<Trait>, serde_json::Value), Box<dyn ::std::error::Error>>;
async fn query(&self) -> Result<serde_json::Value, Box<dyn ::std::error::Error>>;
async fn execute(&mut self, command: Command) -> Result<serde_json::Value, Box<dyn std::error::Error>>;
async fn execute(&self, command: Command) -> Result<serde_json::Value, Box<dyn std::error::Error>>;
}
#(#structs)*
@@ -556,7 +556,7 @@ pub fn traits(item: TokenStream) -> TokenStream {
Ok(state)
}
async fn execute(&mut self, command: Command) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
async fn execute(&self, command: Command) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
let value = match command {
#(#execute)*
};