diff options
author | Martin Fischer <martin@push-f.com> | 2023-08-16 18:54:35 +0200 |
---|---|---|
committer | Martin Fischer <martin@push-f.com> | 2023-08-19 13:41:55 +0200 |
commit | c07334e7bb613774d3535663433c90b6dde86943 (patch) | |
tree | 56907f1e62718d7caa21d6fc05db1b8e66578e65 /src/machine.rs | |
parent | 26cd63394f640920db4ea9402d77cec1358fb098 (diff) |
break!: rename doctype _identifier methods/fields to _id
Just a bit more succinct. And now rustdoc also no longer
cuts off the names of these Emitter methods in its sidebar.
Diffstat (limited to 'src/machine.rs')
-rw-r--r-- | src/machine.rs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/machine.rs b/src/machine.rs index 4a9034e..0755e20 100644 --- a/src/machine.rs +++ b/src/machine.rs @@ -1266,13 +1266,13 @@ where } Some('"') => { slf.emit_error(Error::MissingWhitespaceAfterDoctypePublicKeyword); - slf.emitter.init_doctype_public_identifier(); + slf.emitter.init_doctype_public_id(); slf.state = State::DoctypePublicIdentifierDoubleQuoted; Ok(ControlToken::Continue) } Some('\'') => { slf.emit_error(Error::MissingWhitespaceAfterDoctypePublicKeyword); - slf.emitter.init_doctype_public_identifier(); + slf.emitter.init_doctype_public_id(); slf.state = State::DoctypePublicIdentifierSingleQuoted; Ok(ControlToken::Continue) } @@ -1300,12 +1300,12 @@ where State::BeforeDoctypePublicIdentifier => match slf.read_char()? { Some(whitespace_pat!()) => Ok(ControlToken::Continue), Some('"') => { - slf.emitter.init_doctype_public_identifier(); + slf.emitter.init_doctype_public_id(); slf.state = State::DoctypePublicIdentifierDoubleQuoted; Ok(ControlToken::Continue) } Some('\'') => { - slf.emitter.init_doctype_public_identifier(); + slf.emitter.init_doctype_public_id(); slf.state = State::DoctypePublicIdentifierSingleQuoted; Ok(ControlToken::Continue) } @@ -1337,7 +1337,7 @@ where } Some('\0') => { slf.emit_error(Error::UnexpectedNullCharacter); - slf.emitter.push_doctype_public_identifier("\u{fffd}"); + slf.emitter.push_doctype_public_id("\u{fffd}"); Ok(ControlToken::Continue) } Some('>') => { @@ -1354,7 +1354,7 @@ where Ok(ControlToken::Eof) } Some(x) => { - slf.emitter.push_doctype_public_identifier(ctostr!(x)); + slf.emitter.push_doctype_public_id(ctostr!(x)); Ok(ControlToken::Continue) } }, @@ -1365,7 +1365,7 @@ where } Some('\0') => { slf.emit_error(Error::UnexpectedNullCharacter); - slf.emitter.push_doctype_public_identifier("\u{fffd}"); + slf.emitter.push_doctype_public_id("\u{fffd}"); Ok(ControlToken::Continue) } Some('>') => { @@ -1382,7 +1382,7 @@ where Ok(ControlToken::Eof) } Some(x) => { - slf.emitter.push_doctype_public_identifier(ctostr!(x)); + slf.emitter.push_doctype_public_id(ctostr!(x)); Ok(ControlToken::Continue) } }, @@ -1398,13 +1398,13 @@ where } Some('"') => { slf.emit_error(Error::MissingWhitespaceBetweenDoctypePublicAndSystemIdentifiers); - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierDoubleQuoted; Ok(ControlToken::Continue) } Some('\'') => { slf.emit_error(Error::MissingWhitespaceBetweenDoctypePublicAndSystemIdentifiers); - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierSingleQuoted; Ok(ControlToken::Continue) } @@ -1430,12 +1430,12 @@ where Ok(ControlToken::Continue) } Some('"') => { - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierDoubleQuoted; Ok(ControlToken::Continue) } Some('\'') => { - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierSingleQuoted; Ok(ControlToken::Continue) } @@ -1460,13 +1460,13 @@ where } Some('"') => { slf.emit_error(Error::MissingWhitespaceAfterDoctypeSystemKeyword); - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierDoubleQuoted; Ok(ControlToken::Continue) } Some('\'') => { slf.emit_error(Error::MissingWhitespaceAfterDoctypeSystemKeyword); - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierSingleQuoted; Ok(ControlToken::Continue) } @@ -1494,12 +1494,12 @@ where State::BeforeDoctypeSystemIdentifier => match slf.read_char()? { Some(whitespace_pat!()) => Ok(ControlToken::Continue), Some('"') => { - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierDoubleQuoted; Ok(ControlToken::Continue) } Some('\'') => { - slf.emitter.init_doctype_system_identifier(); + slf.emitter.init_doctype_system_id(); slf.state = State::DoctypeSystemIdentifierSingleQuoted; Ok(ControlToken::Continue) } @@ -1531,7 +1531,7 @@ where } Some('\0') => { slf.emit_error(Error::UnexpectedNullCharacter); - slf.emitter.push_doctype_system_identifier("\u{fffd}"); + slf.emitter.push_doctype_system_id("\u{fffd}"); Ok(ControlToken::Continue) } Some('>') => { @@ -1548,7 +1548,7 @@ where Ok(ControlToken::Eof) } Some(x) => { - slf.emitter.push_doctype_system_identifier(ctostr!(x)); + slf.emitter.push_doctype_system_id(ctostr!(x)); Ok(ControlToken::Continue) } }, @@ -1559,7 +1559,7 @@ where } Some('\0') => { slf.emit_error(Error::UnexpectedNullCharacter); - slf.emitter.push_doctype_system_identifier("\u{fffd}"); + slf.emitter.push_doctype_system_id("\u{fffd}"); Ok(ControlToken::Continue) } Some('>') => { @@ -1576,7 +1576,7 @@ where Ok(ControlToken::Eof) } Some(x) => { - slf.emitter.push_doctype_system_identifier(ctostr!(x)); + slf.emitter.push_doctype_system_id(ctostr!(x)); Ok(ControlToken::Continue) } }, |