Skip to content

Commit 657e353

Browse files
committed
auto merge of #11739 : thestinger/rust/rm-old-ext, r=alexcrichton
2 parents 7cabd40 + a2dab3c commit 657e353

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

man/rustc.1

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ To build an executable from a source file with a main function:
122122
To build a library from a source file:
123123
$ rustc --lib hello-lib.rs
124124

125-
To build either with a crate (.rc) file:
126-
$ rustc hello.rc
125+
To build either with a crate (.rs) file:
126+
$ rustc hello.rs
127127

128128
To build an executable with debug info (experimental):
129129
$ rustc -Z debug-info -o hello hello.rs

src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<language id="rust" _name="Rust" version="2.0" _section="Sources">
66
<metadata>
77
<property name="mimetypes">text/x-rust</property>
8-
<property name="globs">*.rs;*.rc</property>
8+
<property name="globs">*.rs</property>
99
<property name="line-comment-start">//</property>
1010
<property name="block-comment-start">/*</property>
1111
<property name="block-comment-end">*/</property>

src/etc/gedit/share/mime/packages/rust.xml

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<mime-type type="text/x-rust">
33
<comment>Rust Source</comment>
44
<glob pattern="*.rs"/>
5-
<glob pattern="*.rc"/>
65
</mime-type>
76
</mime-info>

src/etc/kate/rust.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
88
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
99
]>
10-
<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
10+
<language name="Rust" version="0.10-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
1111
<highlighting>
1212
<list name="fn">
1313
<item> fn </item>

src/etc/vim/ftdetect/rust.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
au BufRead,BufNewFile *.rs,*.rc set filetype=rust
1+
au BufRead,BufNewFile *.rs set filetype=rust

0 commit comments

Comments
 (0)