mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
userdiff: add built-in pattern for rust
This adds xfuncname and word_regex patterns for Rust, a quite popular programming language. It also includes test cases for the xfuncname regex (t4018) and updated documentation. The word_regex pattern finds identifiers, integers, floats and operators, according to the Rust Reference Book. Cc: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ab15ad1a3b
commit
d74e78602e
@ -833,6 +833,8 @@ patterns are available:
|
||||
|
||||
- `ruby` suitable for source code in the Ruby language.
|
||||
|
||||
- `rust` suitable for source code in the Rust language.
|
||||
|
||||
- `tex` suitable for source code for LaTeX documents.
|
||||
|
||||
|
||||
|
@ -43,6 +43,7 @@ diffpatterns="
|
||||
php
|
||||
python
|
||||
ruby
|
||||
rust
|
||||
tex
|
||||
custom1
|
||||
custom2
|
||||
|
5
t/t4018/rust-fn
Normal file
5
t/t4018/rust-fn
Normal file
@ -0,0 +1,5 @@
|
||||
pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
|
||||
let _ = x;
|
||||
// a comment
|
||||
let a = ChangeMe;
|
||||
}
|
5
t/t4018/rust-impl
Normal file
5
t/t4018/rust-impl
Normal file
@ -0,0 +1,5 @@
|
||||
impl<'a, T: AsRef<[u8]>> std::RIGHT for Git<'a> {
|
||||
|
||||
pub fn ChangeMe(&self) -> () {
|
||||
}
|
||||
}
|
5
t/t4018/rust-struct
Normal file
5
t/t4018/rust-struct
Normal file
@ -0,0 +1,5 @@
|
||||
#[derive(Debug)]
|
||||
pub(super) struct RIGHT<'a> {
|
||||
name: &'a str,
|
||||
age: ChangeMe,
|
||||
}
|
5
t/t4018/rust-trait
Normal file
5
t/t4018/rust-trait
Normal file
@ -0,0 +1,5 @@
|
||||
unsafe trait RIGHT<T> {
|
||||
fn len(&self) -> u32;
|
||||
fn ChangeMe(&self, n: u32) -> T;
|
||||
fn iter<F>(&self, f: F) where F: Fn(T);
|
||||
}
|
@ -130,6 +130,13 @@ PATTERNS("ruby", "^[ \t]*((class|module|def)[ \t].*)$",
|
||||
"(@|@@|\\$)?[a-zA-Z_][a-zA-Z0-9_]*"
|
||||
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?."
|
||||
"|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"),
|
||||
PATTERNS("rust",
|
||||
"^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl(<.+>)?)[ \t]+[^;]*)$",
|
||||
/* -- */
|
||||
"[a-zA-Z_][a-zA-Z0-9_]*"
|
||||
"|[-+_0-9.eE]+(f32|f64|u8|u16|u32|u64|u128|usize|i8|i16|i32|i64|i128|isize)?"
|
||||
"|0[box]?[0-9a-fA-F_]+(u8|u16|u32|u64|u128|usize|i8|i16|i32|i64|i128|isize)?"
|
||||
"|[-+*\\/<>%&^|=!:]=|<<=?|>>=?|&&|\\|\\||->|=>|\\.{2}=|\\.{3}|::"),
|
||||
PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
|
||||
"[={}\"]|[^={}\" \t]+"),
|
||||
PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
|
||||
|
Loading…
Reference in New Issue
Block a user