[geany/geany] 568787: Change Rust tests to be in line with the ones in the universal-ctags tests.

[Pavel Sountsov]

Branch:      refs/heads/master
Author:      Pavel Sountsov <siege at google.com>
Committer:   SiegeLord <slabode at aim.com>
Date:        Sat, 22 Aug 2015 04:21:18 UTC
Commit:      568787bc2f48b8762fcc46a64f2d2ef77cb0bdbc
             https://github.com/geany/geany/commit/568787bc2f48b8762fcc46a64f2d2ef77cb0bdbc

Log Message:
-----------
Change Rust tests to be in line with the ones in the universal-ctags tests.


Modified Paths:
--------------
    tests/ctags/test_input.rs
    tests/ctags/test_input.rs.tags
    tests/ctags/test_input2.rs
    tests/ctags/test_input2.rs.tags

Modified: tests/ctags/test_input.rs
15 lines changed, 10 insertions(+), 5 deletions(-)
===================================================================
@@ -2,8 +2,10 @@
 #![feature(globs)]
 #![feature(macro_rules)]
 use std::*;
-use test_input2::*;
-mod test_input2;
+mod test_input2
+{
+	pub struct SomeStruct;
+}
 
 fn lifetime_and_char<'lifetime>(_: &'lifetime isize)
 {
@@ -41,6 +43,10 @@ impl<T> D<T> for C<T> where T: Send
 {
 }
 
+pub fn where_foo<T>(a: T) where T: Send
+{
+}
+
 /*
  * fn ignored_in_comment() {}
  */
@@ -66,13 +72,12 @@ macro_rules! test_macro
 
 macro_rules! ignore {($($x:tt)*) => (())}
 
-fn yada(a:isize,c:Foo,b:test_input2::fruit::SomeStruct) -> String {
+fn yada(a:isize, c:Foo, b:test_input2::SomeStruct) -> String {
 	a.to_string()
 }
 
 fn main() {	
-	use test_input2::fruit::*;	
-	println!("{}", foo_bar_test_func(SomeStruct{red_value:1,green_value:2,blue_value:3},(4,5)).to_string());
+	use test_input2::*;
 	let a=Foo{foo_field_1:2};
 	a.my_method(1);
 	let c=Animal::a_cat(3);


Modified: tests/ctags/test_input.rs.tags
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -13,6 +13,7 @@ Foo
 Foo2�2048�0
 ParametrizedTrait�32�0
 S1�2048�0
+SomeStruct�2048�test_input2�0
 SuperTraitTest�32�0
 Testable�32�0
 TraitedStructTest�1�0
@@ -50,7 +51,8 @@ test2
 test2�128�(&self)�Testable�0
 test_input2�256�0
 test_macro�65536�0
+where_foo�16�<T>(a: T) where T: Send�0
 x�8�Foo2�0
 x�8�TraitedStructTest�0
 y�8�Foo2�0
-yada�16�(a:isize,c:Foo,b:test_input2::fruit::SomeStruct) -> String�0
+yada�16�(a:isize, c:Foo, b:test_input2::SomeStruct) -> String�0


Modified: tests/ctags/test_input2.rs
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -42,3 +42,5 @@ mod mineral {
 	fn chalk() {
 	}
 }
+
+fn main() {}


Modified: tests/ctags/test_input2.rs.tags
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -13,6 +13,7 @@ fruit
 granite�16�()�mineral�0
 green_value�8�fruit::SomeStruct�0
 limestone�16�()�mineral�0
+main�16�()�0
 mineral�256�0
 not_hashbang�16�()�0
 red_value�8�fruit::SomeStruct�0



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).