Skip to content

Commit 7977c51

Browse files
committed
Merge branch 'schreter_rust_type_alias' into maizatskyi/2025-06-09-async-io-stream
2 parents bec250b + 9c92af4 commit 7977c51

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

gen/src/write.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use syntax::map::UnorderedMap as Map;
99
use syntax::set::UnorderedSet;
1010
use syntax::symbol::{self, Symbol};
1111
use syntax::trivial::{self, TrivialReason};
12-
use syntax::Lang;
1312
use syntax::{
1413
derive, mangle, Api, Doc, Enum, EnumRepr, ExternFn, ExternType, Lang, Pair, Signature, Struct,
1514
Trait, Type, TypeAlias, Types, Var,
@@ -134,7 +133,7 @@ fn write_data_structures<'a>(out: &mut OutFile<'a>, apis: &'a [Api]) {
134133
match ety.lang {
135134
Lang::Cxx => {
136135
if let Some(reasons) = out.types.required_trivial.get(&ety.name.rust) {
137-
check_trivial_extern_type(out, ety, reasons)
136+
check_trivial_extern_type(out, ety, reasons);
138137
}
139138
}
140139
Lang::Rust => {

macro/src/expand.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fn expand(ffi: Module, doc: Doc, attrs: OtherAttrs, apis: &[Api], types: &Types)
9090
hidden.extend(expand_rust_type_layout(ety, types));
9191
}
9292
Api::RustFunction(efn) => {
93-
if efn.sig.asyncness.is_some() && &efn.name.cxx == "read" {
93+
if efn.asyncness.is_some() {
9494
// todo!("expand_rust_function_shim\n{}", expand_rust_function_shim(efn, types).to_string());
9595
}
9696
hidden.extend(expand_rust_function_shim(efn, types));
@@ -1346,10 +1346,7 @@ fn expand_type_alias_rust(alias: &TypeAlias) -> TokenStream {
13461346
let doc = &alias.doc;
13471347
let attrs = &alias.attrs;
13481348
let visibility = alias.visibility;
1349-
let _type_token = alias.type_token;
13501349
let ident = &alias.name.rust;
1351-
let _generics = &alias.generics;
1352-
let _eq_token = alias.eq_token;
13531350
let ty = &alias.ty;
13541351
let semi_token = alias.semi_token;
13551352

0 commit comments

Comments
 (0)