Skip to content

Commit

Permalink
auto merge of #11739 : thestinger/rust/rm-old-ext, r=alexcrichton
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Jan 23, 2014
2 parents 7cabd40 + a2dab3c commit 657e353
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions man/rustc.1
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ To build an executable from a source file with a main function:
To build a library from a source file:
$ rustc --lib hello-lib.rs

To build either with a crate (.rc) file:
$ rustc hello.rc
To build either with a crate (.rs) file:
$ rustc hello.rs

To build an executable with debug info (experimental):
$ rustc -Z debug-info -o hello hello.rs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<language id="rust" _name="Rust" version="2.0" _section="Sources">
<metadata>
<property name="mimetypes">text/x-rust</property>
<property name="globs">*.rs;*.rc</property>
<property name="globs">*.rs</property>
<property name="line-comment-start">//</property>
<property name="block-comment-start">/*</property>
<property name="block-comment-end">*/</property>
Expand Down
1 change: 0 additions & 1 deletion src/etc/gedit/share/mime/packages/rust.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
<mime-type type="text/x-rust">
<comment>Rust Source</comment>
<glob pattern="*.rs"/>
<glob pattern="*.rc"/>
</mime-type>
</mime-info>
2 changes: 1 addition & 1 deletion src/etc/kate/rust.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
]>
<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
<highlighting>
<list name="fn">
<item> fn </item>
Expand Down
2 changes: 1 addition & 1 deletion src/etc/vim/ftdetect/rust.vim
Original file line number Diff line number Diff line change
@@ -1 +1 @@
au BufRead,BufNewFile *.rs,*.rc set filetype=rust
au BufRead,BufNewFile *.rs set filetype=rust

0 comments on commit 657e353

Please sign in to comment.