Continue removing MyError.

This commit is contained in:
Tom Alexander
2023-10-17 10:35:33 -04:00
parent e776a051ad
commit 20c4a0f8f7
13 changed files with 29 additions and 37 deletions

View File

@@ -125,7 +125,7 @@ fn document_org_source<'b, 'g, 'r, 's>(
.get_global_settings()
.file_access
.read_file(setup_file)
.map_err(|err| nom::Err::<CustomError<OrgSource<'_>>>::Failure(err.into()))
.map_err(|err| nom::Err::<CustomError>::Failure(err.into()))
})
.collect::<Result<Vec<_>, _>>()?;
for setup_file in setup_files.iter().map(String::as_str) {
@@ -171,14 +171,14 @@ fn document_org_source<'b, 'g, 'r, 's>(
let (remaining, mut document) = _document(&parser_context, input)
.map(|(rem, out)| (Into::<&str>::into(rem), out))?;
apply_post_parse_in_buffer_settings(&mut document)
.map_err(|err| nom::Err::<CustomError<OrgSource<'_>>>::Failure(err.into()))?;
.map_err(|err| nom::Err::<CustomError>::Failure(err.into()))?;
return Ok((remaining.into(), document));
}
}
// Find final in-buffer settings that do not impact parsing
apply_post_parse_in_buffer_settings(&mut document)
.map_err(|err| nom::Err::<CustomError<OrgSource<'_>>>::Failure(err.into()))?;
.map_err(|err| nom::Err::<CustomError>::Failure(err.into()))?;
Ok((remaining.into(), document))
}