Run cargo fix.
clippy Build clippy has failed Details
rust-foreign-document-test Build rust-foreign-document-test has succeeded Details
rust-build Build rust-build has succeeded Details
rust-test Build rust-test has succeeded Details

main
Tom Alexander 4 months ago
parent 44483b4d54
commit 6b62176fd0
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE

@ -1,7 +1,7 @@
use std::path::Path;
use crate::compare::diff::compare_document;
use crate::compare::diff::DiffResult;
use crate::compare::sexp::sexp;
use crate::context::GlobalSettings;
use crate::context::LocalFileAccessInterface;

@ -11,13 +11,13 @@ pub use compare::run_compare_on_file;
pub use compare::run_compare_on_file_with_settings;
pub use compare::silent_anonymous_compare;
pub use compare::silent_compare_on_file;
pub(crate) use compare_field::EmacsField;
pub use sexp::sexp;
pub(crate) use sexp::unquote;
pub(crate) use sexp::TextWithProperties;
pub use sexp::Token;
pub(crate) use util::get_emacs_standard_properties;
pub(crate) use util::get_property;
pub(crate) use util::get_property_quoted_string;
pub(crate) use util::maybe_token_to_usize;
pub(crate) use util::EmacsStandardProperties;

@ -1,4 +1,4 @@
use std::borrow::Cow;
use std::collections::HashMap;
use serde::Deserialize;

@ -65,67 +65,67 @@ mod verse_block;
pub use additional_property::AdditionalProperties;
pub use additional_property::AdditionalPropertyValue;
pub(crate) use angle_link::WasmAngleLink;
pub use ast_node::WasmAstNode;
pub use ast_node::WasmAstNodeWrapper;
pub(crate) use babel_call::WasmBabelCall;
pub(crate) use bold::WasmBold;
pub(crate) use center_block::WasmCenterBlock;
pub(crate) use citation::WasmCitation;
pub(crate) use citation_reference::WasmCitationReference;
pub(crate) use clock::WasmClock;
pub(crate) use code::WasmCode;
pub(crate) use comment::WasmComment;
pub(crate) use comment_block::WasmCommentBlock;
pub(crate) use diary_sexp::WasmDiarySexp;
pub use document::WasmDocument;
pub(crate) use drawer::WasmDrawer;
pub(crate) use dynamic_block::WasmDynamicBlock;
pub(crate) use entity::WasmEntity;
pub(crate) use example_block::WasmExampleBlock;
pub(crate) use export_block::WasmExportBlock;
pub(crate) use export_snippet::WasmExportSnippet;
pub(crate) use fixed_width_area::WasmFixedWidthArea;
pub(crate) use footnote_definition::WasmFootnoteDefinition;
pub(crate) use footnote_reference::WasmFootnoteReference;
pub(crate) use headline::WasmHeadline;
pub(crate) use horizontal_rule::WasmHorizontalRule;
pub(crate) use inline_babel_call::WasmInlineBabelCall;
pub(crate) use inline_source_block::WasmInlineSourceBlock;
pub(crate) use italic::WasmItalic;
pub(crate) use keyword::WasmKeyword;
pub(crate) use latex_environment::WasmLatexEnvironment;
pub(crate) use latex_fragment::WasmLatexFragment;
pub(crate) use line_break::WasmLineBreak;
pub(crate) use node_property::WasmNodeProperty;
pub(crate) use org_macro::WasmOrgMacro;
pub(crate) use paragraph::WasmParagraph;
pub use parse_result::ParseResult;
pub(crate) use plain_link::WasmPlainLink;
pub(crate) use plain_list::WasmPlainList;
pub(crate) use plain_list_item::WasmPlainListItem;
pub(crate) use plain_text::WasmPlainText;
pub(crate) use planning::WasmPlanning;
pub(crate) use property_drawer::WasmPropertyDrawer;
pub(crate) use quote_block::WasmQuoteBlock;
pub(crate) use radio_link::WasmRadioLink;
pub(crate) use radio_target::WasmRadioTarget;
pub(crate) use regular_link::WasmRegularLink;
pub(crate) use section::WasmSection;
pub(crate) use special_block::WasmSpecialBlock;
pub(crate) use src_block::WasmSrcBlock;
pub(crate) use standard_properties::WasmStandardProperties;
pub(crate) use statistics_cookie::WasmStatisticsCookie;
pub(crate) use strike_through::WasmStrikeThrough;
pub(crate) use subscript::WasmSubscript;
pub(crate) use superscript::WasmSuperscript;
pub(crate) use table::WasmTable;
pub(crate) use table_cell::WasmTableCell;
pub(crate) use table_row::WasmTableRow;
pub(crate) use target::WasmTarget;
pub(crate) use timestamp::WasmTimestamp;
pub use to_wasm::ToWasm;
pub use to_wasm::ToWasmContext;
pub(crate) use underline::WasmUnderline;
pub(crate) use verbatim::WasmVerbatim;
pub(crate) use verse_block::WasmVerseBlock;

@ -376,7 +376,7 @@ fn wasm_key_to_emacs_key<WK: std::fmt::Display>(wasm_key: WK) -> String {
}
fn compare_quoted_string<'e, 's, 'w>(
source: &'s str,
_source: &'s str,
emacs: &'e str,
wasm: &'w String,
) -> Result<WasmDiffResult<'s>, Box<dyn std::error::Error>> {
@ -658,7 +658,7 @@ fn compare_object_tree<'e, 's, 'w>(
}
fn compare_number_lines<'e, 's, 'w>(
source: &'s str,
_source: &'s str,
emacs: &'e Vec<Token<'s>>,
wasm: &'w serde_json::Map<String, serde_json::Value>,
) -> Result<WasmDiffResult<'s>, Box<dyn std::error::Error>> {
@ -745,7 +745,7 @@ fn compare_number_lines<'e, 's, 'w>(
}
fn compare_string_set<'e, 's, 'w>(
source: &'s str,
_source: &'s str,
emacs: &'e Vec<Token<'s>>,
wasm: &'w serde_json::Map<String, serde_json::Value>,
) -> Result<WasmDiffResult<'s>, Box<dyn std::error::Error>> {

@ -140,4 +140,4 @@ macro_rules! wasm_compare {
result
}};
}
pub(crate) use wasm_compare;

Loading…
Cancel
Save