Skip to content

Commit 93492ff

Browse files
committed
Format
1 parent 5513dd8 commit 93492ff

File tree

2 files changed

+59
-68
lines changed

2 files changed

+59
-68
lines changed

moonc_wasm/src/wasmoo_extern.rs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -378,28 +378,31 @@ fn access(
378378
let mode = args.get(1);
379379
let mode = mode.to_number(scope).unwrap().value() as i32;
380380
if mode & F_OK != 0
381-
&& let Err(err) = metadata(path) {
382-
let message = v8::String::new(scope, &err.to_string()).unwrap();
383-
let exn = v8::Exception::error(scope, message);
384-
scope.throw_exception(exn);
385-
return;
386-
}
381+
&& let Err(err) = metadata(path)
382+
{
383+
let message = v8::String::new(scope, &err.to_string()).unwrap();
384+
let exn = v8::Exception::error(scope, message);
385+
scope.throw_exception(exn);
386+
return;
387+
}
387388

388389
if mode & R_OK != 0
389-
&& let Err(err) = File::open(path) {
390-
let message = v8::String::new(scope, &err.to_string()).unwrap();
391-
let exn = v8::Exception::error(scope, message);
392-
scope.throw_exception(exn);
393-
return;
394-
}
390+
&& let Err(err) = File::open(path)
391+
{
392+
let message = v8::String::new(scope, &err.to_string()).unwrap();
393+
let exn = v8::Exception::error(scope, message);
394+
scope.throw_exception(exn);
395+
return;
396+
}
395397

396398
if mode & W_OK != 0
397-
&& let Err(err) = OpenOptions::new().write(true).open(path) {
398-
let message = v8::String::new(scope, &err.to_string()).unwrap();
399-
let exn = v8::Exception::error(scope, message);
400-
scope.throw_exception(exn);
401-
return;
402-
}
399+
&& let Err(err) = OpenOptions::new().write(true).open(path)
400+
{
401+
let message = v8::String::new(scope, &err.to_string()).unwrap();
402+
let exn = v8::Exception::error(scope, message);
403+
scope.throw_exception(exn);
404+
return;
405+
}
403406

404407
if mode & X_OK != 0 {
405408
match metadata(path) {

src/lib.rs

Lines changed: 38 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -812,33 +812,27 @@ impl MoonBitComponent {
812812
let mut imported_interfaces = Vec::new();
813813
for (_, item) in &world.imports {
814814
if let wit_parser::WorldItem::Interface { id, .. } = item
815-
&& let Some(interface) = self.resolve.as_ref().and_then(|r| r.interfaces.get(*id)) {
816-
if let Some(interface_name) = interface.name.as_ref() {
817-
let owner_package = interface.package.ok_or_else(|| {
818-
anyhow::anyhow!(
819-
"Interface '{}' does not have a package",
820-
interface_name
821-
)
815+
&& let Some(interface) = self.resolve.as_ref().and_then(|r| r.interfaces.get(*id))
816+
{
817+
if let Some(interface_name) = interface.name.as_ref() {
818+
let owner_package = interface.package.ok_or_else(|| {
819+
anyhow::anyhow!("Interface '{}' does not have a package", interface_name)
820+
})?;
821+
let package = self
822+
.resolve
823+
.as_ref()
824+
.and_then(|r| r.packages.get(owner_package))
825+
.ok_or_else(|| {
826+
anyhow::anyhow!("Package for interface '{}' not found", interface_name)
822827
})?;
823-
let package = self
824-
.resolve
825-
.as_ref()
826-
.and_then(|r| r.packages.get(owner_package))
827-
.ok_or_else(|| {
828-
anyhow::anyhow!(
829-
"Package for interface '{}' not found",
830-
interface_name
831-
)
832-
})?;
833-
834-
imported_interfaces
835-
.push((package.name.clone(), interface_name.to_string()));
836-
} else {
837-
return Err(anyhow::anyhow!(
838-
"Anonymous imported interfaces are not supported"
839-
));
840-
}
828+
829+
imported_interfaces.push((package.name.clone(), interface_name.to_string()));
830+
} else {
831+
return Err(anyhow::anyhow!(
832+
"Anonymous imported interfaces are not supported"
833+
));
841834
}
835+
}
842836
}
843837
Ok(imported_interfaces)
844838
}
@@ -852,33 +846,27 @@ impl MoonBitComponent {
852846
let mut exported_interfaces = Vec::new();
853847
for (_, item) in &world.exports {
854848
if let wit_parser::WorldItem::Interface { id, .. } = item
855-
&& let Some(interface) = self.resolve.as_ref().and_then(|r| r.interfaces.get(*id)) {
856-
if let Some(interface_name) = interface.name.as_ref() {
857-
let owner_package = interface.package.ok_or_else(|| {
858-
anyhow::anyhow!(
859-
"Interface '{}' does not have a package",
860-
interface_name
861-
)
849+
&& let Some(interface) = self.resolve.as_ref().and_then(|r| r.interfaces.get(*id))
850+
{
851+
if let Some(interface_name) = interface.name.as_ref() {
852+
let owner_package = interface.package.ok_or_else(|| {
853+
anyhow::anyhow!("Interface '{}' does not have a package", interface_name)
854+
})?;
855+
let package = self
856+
.resolve
857+
.as_ref()
858+
.and_then(|r| r.packages.get(owner_package))
859+
.ok_or_else(|| {
860+
anyhow::anyhow!("Package for interface '{}' not found", interface_name)
862861
})?;
863-
let package = self
864-
.resolve
865-
.as_ref()
866-
.and_then(|r| r.packages.get(owner_package))
867-
.ok_or_else(|| {
868-
anyhow::anyhow!(
869-
"Package for interface '{}' not found",
870-
interface_name
871-
)
872-
})?;
873-
874-
exported_interfaces
875-
.push((package.name.clone(), interface_name.to_string()));
876-
} else {
877-
return Err(anyhow::anyhow!(
878-
"Anonymous exported interfaces are not supported"
879-
));
880-
}
862+
863+
exported_interfaces.push((package.name.clone(), interface_name.to_string()));
864+
} else {
865+
return Err(anyhow::anyhow!(
866+
"Anonymous exported interfaces are not supported"
867+
));
881868
}
869+
}
882870
}
883871
Ok(exported_interfaces)
884872
}

0 commit comments

Comments
 (0)