Skip to content

Commit

Permalink
Fix two regressions introduced by #11072.
Browse files Browse the repository at this point in the history
There, concrete evidence that I shouldn't try doing such things at 1:30am.
  • Loading branch information
chris-morgan committed Dec 19, 2013
1 parent 3906823 commit 2205580
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/etc/ctags.rust
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
--regex-Rust=/^[ \t]*(pub[ \t]+)?fn[ \t]+([a-zA-Z0-9_]+)/\2/f,functions,function definitions/
--regex-Rust=/^[ \t]*(pub[ \t]+)?type[ \t]+([a-zA-Z0-9_]+)/\2/T,types,type definitions/
--regex-Rust=/^[ \t]*(pub[ \t]+)?enum[ \t]+([a-zA-Z0-9_]+)/\2/g,enum,enumeration names/
--regex-Rust=/^[ \t]*(pub[ \t]+)?enum[ \t]+([a-zA-Z0-9_]+)/\2/g,enum,enumeration names/
--regex-Rust=/^[ \t]*(pub[ \t]+)?struct[ \t]+([a-zA-Z0-9_]+)/\2/s,structure names/
--regex-Rust=/^[ \t]*(pub[ \t]+)?mod[ \t]+([a-zA-Z0-9_]+)/\2/m,modules,module names/
--regex-Rust=/^[ \t]*(pub[ \t]+)?static[ \t]+([a-zA-Z0-9_]+)/\2/c,consts,static constants/
--regex-Rust=/^[ \t]*(pub[ \t]+)?trait[ \t]+([a-zA-Z0-9_]+)/\2/t,traits,traits/
--regex-Rust=/^[ \t]*(pub[ \t]+)?impl([ \t\n]+<.*>)?[ \t]+([a-zA-Z0-9_]+)/\3/i,impls,trait implementations/
--regex-Rust=/^[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\2/d,macros,macro definitions/
--regex-Rust=/^[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\1/d,macros,macro definitions/

9 comments on commit 2205580

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 20, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at chris-morgan@2205580

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 20, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging chris-morgan/rust/fix-11072-regressions = 2205580 into auto

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 20, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chris-morgan/rust/fix-11072-regressions = 2205580 merged ok, testing candidate = a070f82c

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 20, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 21, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at chris-morgan@2205580

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 21, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging chris-morgan/rust/fix-11072-regressions = 2205580 into auto

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 21, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chris-morgan/rust/fix-11072-regressions = 2205580 merged ok, testing candidate = 35fc0c8

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 21, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 2205580 Dec 21, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 35fc0c8

Please sign in to comment.