diff --git a/src/conflicts.rs b/src/conflicts.rs index 1490fb9d5..d12449c41 100644 --- a/src/conflicts.rs +++ b/src/conflicts.rs @@ -1,6 +1,6 @@ //! Apply conflict markers to obtain the original file contents. //! -//! https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-mergeconflictStyle +//! use ConflictState::*; diff --git a/src/diff/graph.rs b/src/diff/graph.rs index f9b0ddbcb..c8d00f1ad 100644 --- a/src/diff/graph.rs +++ b/src/diff/graph.rs @@ -272,7 +272,7 @@ impl<'s, 'b> Vertex<'s, 'b> { /// at least a NovelFoo edge. Depending on the syntax nodes of the /// current [`Vertex`], other edges may also be available. /// -/// See [`neighbours`] for all the edges available for a given `Vertex`. +/// See [`set_neighbours`] for all the edges available for a given `Vertex`. #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum Edge { UnchangedNode { diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs index 23f91e7dc..d42b20b3e 100644 --- a/src/parse/tree_sitter_parser.rs +++ b/src/parse/tree_sitter_parser.rs @@ -15,7 +15,7 @@ use super::syntax; use super::syntax::MatchedPos; /// A language may contain certain nodes that are in other languages -/// and should be parsed as such (e.g. HTML