Skip to content

Commit

Permalink
Merge branch 'master' into web-features-0.54.0
Browse files Browse the repository at this point in the history
  • Loading branch information
riverar committed Mar 25, 2024
2 parents 83b16b8 + da86e1c commit 508bec6
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions crates/libs/bindgen/src/rdl/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(dead_code)]

use super::*;
mod fmt;
mod from_reader;
Expand Down
3 changes: 1 addition & 2 deletions crates/libs/bindgen/src/rust/cfg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ pub struct Cfg {
pub types: std::collections::BTreeMap<&'static str, std::collections::BTreeSet<metadata::TypeDef>>,
pub core_types: std::collections::BTreeSet<metadata::Type>,
pub arches: std::collections::BTreeSet<&'static str>,
pub implement: bool,
}

impl Cfg {
Expand Down Expand Up @@ -47,7 +46,7 @@ pub fn type_def_cfg(writer: &Writer, row: metadata::TypeDef, generics: &[metadat
cfg
}
pub fn type_def_cfg_impl(writer: &Writer, def: metadata::TypeDef, generics: &[metadata::Type]) -> Cfg {
let mut cfg = Cfg { implement: true, ..Default::default() };
let mut cfg = Cfg::default();

fn combine(writer: &Writer, def: metadata::TypeDef, generics: &[metadata::Type], cfg: &mut Cfg) {
type_def_cfg_combine(writer, def, generics, cfg);
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/bindgen/src/winmd/writer/tables.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![allow(non_snake_case)]
#![allow(dead_code, non_snake_case)]

use super::*;

Expand Down
Binary file modified crates/targets/aarch64_gnullvm/lib/libwindows.0.52.0.a
Binary file not shown.
Binary file modified crates/targets/x86_64_gnullvm/lib/libwindows.0.52.0.a
Binary file not shown.

0 comments on commit 508bec6

Please sign in to comment.