Mirrors/libyaml-safer
2
0
Fork 0
mirror of https://github.com/simonask/libyaml-safer synced 2024-11-22 19:33:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Eliminate return value of emitter increase indent

Browse source
This commit is contained in:
David Tolnay 2022-07-30 02:24:38 -07:00
parent cc34693df5
commit c88e4039e1
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/emitter.rs
View file

@ -231,14 +231,13 @@ unsafe fn yaml_emitter_increase_indent(
mut emitter: *mut yaml_emitter_t,
flow: bool,
indentless: bool,
) -> Success {
) {
PUSH!((*emitter).indents, (*emitter).indent);
if (*emitter).indent < 0 {
(*emitter).indent = if flow { (*emitter).best_indent } else { 0 };
} else if !indentless {
(*emitter).indent += (*emitter).best_indent;
}
OK
}
unsafe fn yaml_emitter_state_machine(
@ -622,9 +621,7 @@ unsafe fn yaml_emitter_emit_flow_sequence_item(
{
return FAIL;
}
if yaml_emitter_increase_indent(emitter, true, false).fail {
return FAIL;
}
yaml_emitter_increase_indent(emitter, true, false);
let fresh12 = addr_of_mut!((*emitter).flow_level);
*fresh12 += 1;
}
@ -701,9 +698,7 @@ unsafe fn yaml_emitter_emit_flow_mapping_key(
{
return FAIL;
}
if yaml_emitter_increase_indent(emitter, true, false).fail {
return FAIL;
}
yaml_emitter_increase_indent(emitter, true, false);
let fresh18 = addr_of_mut!((*emitter).flow_level);
*fresh18 += 1;
}
@ -827,15 +822,11 @@ unsafe fn yaml_emitter_emit_block_sequence_item(
first: bool,
) -> Success {
if first {
if yaml_emitter_increase_indent(
yaml_emitter_increase_indent(
emitter,
false,
(*emitter).mapping_context && !(*emitter).indention,
)
.fail
{
return FAIL;
}
);
}
if (*event).type_ == YAML_SEQUENCE_END_EVENT {
(*emitter).indent = POP!((*emitter).indents);
@ -866,9 +857,7 @@ unsafe fn yaml_emitter_emit_block_mapping_key(
first: bool,
) -> Success {
if first {
if yaml_emitter_increase_indent(emitter, false, false).fail {
return FAIL;
}
yaml_emitter_increase_indent(emitter, false, false);
}
if (*event).type_ == YAML_MAPPING_END_EVENT {
(*emitter).indent = POP!((*emitter).indents);
@ -992,9 +981,7 @@ unsafe fn yaml_emitter_emit_scalar(
if yaml_emitter_process_tag(emitter).fail {
return FAIL;
}
if yaml_emitter_increase_indent(emitter, true, false).fail {
return FAIL;
}
yaml_emitter_increase_indent(emitter, true, false);
if yaml_emitter_process_scalar(emitter).fail {
return FAIL;
}