Updated plugins

sources_non_forked/vim-snippets/UltiSnips/rust.snippets

@@ -2,45 +2,70 @@
 #                            Rust Snippets                            #
 #######################################################################
 
-###############
-#  Functions  #
-###############
-snippet fn "A function, optionally with arguments and return type."
+priority -50
+
+snippet fn "A function, optionally with arguments and return type." b
 fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
-snippet test "Test function"
+snippet test "Test function" b
 #[test]
 fn ${1:test_function_name}() {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet new "A new function"
-pub fn new(${2}) -> ${1:Name} {
-	${VISUAL}${0}return $1 { ${3} };
-}
-endsnippet
-
-snippet main "The main function"
-pub fn main() {
 	${VISUAL}${0}
 }
 endsnippet
 
 
+snippet bench "Bench function" b
+#[bench]
+fn ${1:bench_function_name}(b: &mut test::Bencher) {
+	b.iter(|| {
+		${VISUAL}${0}
+	})
+}
+endsnippet
 
-snippet let "A let statement"
+snippet new "A new function" b
+pub fn new(${2}) -> ${1:Name} {
+	${VISUAL}${0}return $1 { ${3} };
+}
+endsnippet
+
+snippet main "The main function" b
+pub fn main() {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet let "A let statement" b
 let ${1:name}${3} = ${VISUAL}${2};
 endsnippet
 
+snippet lmut "let mut = .." b
+let mut ${1:name}${3} = ${VISUAL}${2};
+endsnippet
+
+snippet pri "print!(..)" b
+print!("${1}"${2/..*/, /}${2});
+endsnippet
+
 snippet pln "println!(..)" b
 println!("${1}"${2/..*/, /}${2});
 endsnippet
 
+snippet fmt "format!(..)"
+format!("${1}"${2/..*/, /}${2});
+endsnippet
 
+snippet macro "macro_rules!" b
+macro_rules! ${1:name} (
+	(${2:matcher}) => (
+		${3}
+	)
+)
+endsnippet
 
 snippet ec "extern crate ..." b
 extern crate ${1:sync};
@@ -51,10 +76,10 @@ snippet ecl "...extern crate log;" b
 #[phase(syntax, link)] extern crate log;
 endsnippet
 
-snippet mod	 "A mod." b
+snippet mod	 "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-} /* $1 */
+	${VISUAL}${0}
+}
 endsnippet
 
 snippet crate "Create header information" b
@@ -78,24 +103,45 @@ snippet feat "#![feature(..)]" b
 #![feature(${1:macro_rules})]
 endsnippet
 
+snippet der "#[deriving(..)]" b
+#[deriving(${1:Show})]
+endsnippet
+
+snippet attr "#[..]" b
+#[${1:inline}]
+endsnippet
 
-##################
-#  Common types  #
-##################
 snippet opt "Option<..>"
 Option<${1:int}>
 endsnippet
 
 snippet res "Result<.., ..>"
-Result<${1:~str}, ${2:()}>
+Result<${1:int}, ${2:()}>
 endsnippet
 
-
-
-
 snippet if "if .. (if)" b
-if ${1:/* condition */} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+if ${1} {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet el "else .. (el)"
+else {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet eli "else if .. (eli)"
+else if ${1} {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet ife "if .. else (ife)"
+if ${1} {
+	${2}
+} else {
+	${3}
 }
 endsnippet
 
@@ -105,21 +151,27 @@ match ${1} {
 }
 endsnippet
 
+snippet loop "loop {}" b
+loop {
+	${VISUAL}${0}
+}
+endsnippet
+
 snippet while "while .. {}" b
-while ${1:condition} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+while ${1} {
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet for "for .. in .." b
 for ${1:i} in ${2:range(0u, 10)} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet spawn "spawn(proc() { .. });" b
 spawn(proc() {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 });
 endsnippet
 
@@ -131,26 +183,23 @@ snippet duplex "Duplex stream" b
 let (${1:from_child}, ${2:to_child}) = sync::duplex();
 endsnippet
 
-#####################
-#  TODO commenting  #
-#####################
 snippet todo "A Todo comment"
 // [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
 endsnippet
 
+snippet fixme "FIXME comment"
+// FIXME: ${1}
+endsnippet
 
-############
-#  Struct  #
-############
 snippet st "Struct" b
-struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet stn "Struct with new constructor." b
-pub struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
-	${3:/* code */}
+pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
+	${3}
 }
 
 impl $1 {
@@ -162,48 +211,36 @@ impl $1 {
 }
 endsnippet
 
-
-##########
-#  Enum  #
-##########
 snippet enum "An enum" b
-enum ${1:enum_name} {
+enum ${1:Name} {
 	${VISUAL}${0},
 }
 endsnippet
 
+snippet type "A type" b
+type ${1:NewName} = ${VISUAL}${0};
+endsnippet
 
-##########
-#  Impl  #
-##########
 snippet imp "An impl" b
 impl ${1:Name} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet drop "Drop implementation" b
 impl Drop for ${1:Name} {
 	fn drop(&mut self) {
-		${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+		${VISUAL}${0}
 	}
 }
 endsnippet
 
-
-############
-#  Traits  #
-############
-snippet trait "Trait block" b
+snippet trait "Trait definition" b
 trait ${1:Name} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
-
-#############
-#  Statics  #
-#############
 snippet ss "A static string."
 static ${1}: &'static str = "${VISUAL}${0}";
 endsnippet