fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-06 04:11:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix some of @ohanar issues

Browse Source
This commit is contained in:
Richard Dodd 2018-08-12 12:11:09 +01:00
parent eaacdc8966
commit e66d4da835
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/webidl/src/first_pass.rs
View File

@ -42,7 +42,6 @@ pub(crate) struct InterfaceData<'src> {
} }
/// We need to collect namespace data during the first pass, to be used later. /// We need to collect namespace data during the first pass, to be used later.
#[derive(Default)]
pub(crate) struct NamespaceData<'src> { pub(crate) struct NamespaceData<'src> {
/// Whether only partial namespaces were encountered /// Whether only partial namespaces were encountered
pub(crate) partial: bool, pub(crate) partial: bool,
@ -50,8 +49,15 @@ pub(crate) struct NamespaceData<'src> {
} }
impl<'src> NamespaceData<'src> { impl<'src> NamespaceData<'src> {
/// Same as `Default::default` but sets `partial` to true. /// Creates an empty node for a non-partial namespace.
pub(crate) fn default_for_partial() -> Self { pub(crate) fn empty_non_partial() -> Self {
Self {
partial: false,
operations: Default::default(),
}
}
/// Creates an empty node for a partial namespace.
pub(crate) fn empty_partial() -> Self {
Self { Self {
partial: true, partial: true,
operations: Default::default(), operations: Default::default(),
@ -153,7 +159,7 @@ fn first_pass_interface_operation<'src>(
.operations .operations
.entry(id) .entry(id)
.and_modify(|operation_data| operation_data.overloaded = true) .and_modify(|operation_data| operation_data.overloaded = true)
.or_insert_with(Default::default) .or_default()
.argument_names_same .argument_names_same
.entry(names) .entry(names)
.and_modify(|same_argument_names| *same_argument_names = true) .and_modify(|same_argument_names| *same_argument_names = true)
@ -340,13 +346,11 @@ impl<'src> FirstPass<'src, ()> for weedle::TypedefDefinition<'src> {
impl<'src> FirstPass<'src, ()> for weedle::NamespaceDefinition<'src> { impl<'src> FirstPass<'src, ()> for weedle::NamespaceDefinition<'src> {
fn first_pass(&'src self, record: &mut FirstPassRecord<'src>, (): ()) -> Result<()> { fn first_pass(&'src self, record: &mut FirstPassRecord<'src>, (): ()) -> Result<()> {
{ record
let namespace = record .namespaces
.namespaces .entry(self.identifier.0)
.entry(self.identifier.0) .and_modify(|entry| entry.partial = false)
.or_default(); .or_insert_with(Namespace::empty_non_partial);
namespace.partial = false;
}
if util::is_chrome_only(&self.attributes) { if util::is_chrome_only(&self.attributes) {
return Ok(()) return Ok(())
@ -367,7 +371,7 @@ impl<'src> FirstPass<'src, ()> for weedle::PartialNamespaceDefinition<'src> {
record record
.namespaces .namespaces
.entry(self.identifier.0) .entry(self.identifier.0)
.or_insert_with(NamespaceData::default_for_partial); .or_insert_with(NamespaceData::empty_partial);
if util::is_chrome_only(&self.attributes) { if util::is_chrome_only(&self.attributes) {
return Ok(()) return Ok(())