Skip to content

Commit 8c3aa79

Browse files
committed
---
yaml --- r: 22901 b: refs/heads/master c: 7f60c56 h: refs/heads/master i: 22899: bcd3f66 v: v3
1 parent bcc8e87 commit 8c3aa79

File tree

26 files changed

+280
-154
lines changed

26 files changed

+280
-154
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 213291e0c187ecf17476082e5eebc2981a7303b3
2+
refs/heads/master: 7f60c56c3e1abfc9cae313ba8d0ed26ff455a9c1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/cargo/cargo.rc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818

1919
#[no_core];
2020

21-
22-
// NB: transitional for stage0:
23-
#[allow(unrecognized_lint)];
24-
#[warn(no_unrecognized_warning)];
25-
#[warn(no_non_implicitly_copyable_typarams,
26-
no_vecs_not_implicitly_copyable)];
27-
// The new version:
2821
#[allow(vecs_implicitly_copyable,
2922
non_implicitly_copyable_typarams)];
3023

trunk/src/compiletest/compiletest.rc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
#[no_core];
44

5-
// NB: transitional for stage0:
6-
#[allow(unrecognized_lint)];
7-
#[warn(no_unrecognized_warning)];
8-
#[warn(no_vecs_not_implicitly_copyable)];
9-
// The new version:
105
#[allow(vecs_implicitly_copyable)];
116

127
use core(vers = "0.3");

trunk/src/etc/vim/after/syntax/rust.vim

Lines changed: 0 additions & 30 deletions
This file was deleted.

trunk/src/etc/vim/syntax/rust.vim

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,19 @@ syn region rustComment start="//" skip="\\$" end="$" contains=rustTodo ke
103103

104104
syn keyword rustTodo TODO FIXME XXX NB
105105

106+
" For those who don't want to see `::`...
107+
syn match rustModPathSep "::" conceal cchar=
108+
109+
syn match rustArrowHead contained ">" conceal cchar= 
110+
syn match rustArrowTail contained "-" conceal cchar=
111+
syn match rustArrowFull "->" contains=rustArrowHead,rustArrowTail
112+
113+
syn match rustFatArrowHead contained ">" conceal cchar= 
114+
syn match rustFatArrowTail contained "=" conceal cchar=
115+
syn match rustFatArrowFull "=>" contains=rustFatArrowHead,rustFatArrowTail
116+
117+
syn match rustIdentifierPrime /\<\@!_\(_*\>\)\@=/ conceal cchar=
118+
106119
hi def link rustHexNumber rustNumber
107120
hi def link rustBinNumber rustNumber
108121
hi def link rustIdentifierPrime rustIdentifier
@@ -123,7 +136,7 @@ hi def link rustMacro Macro
123136
hi def link rustType Type
124137
hi def link rustTodo Todo
125138
hi def link rustAttribute PreProc
126-
139+
hi def link rustModPathSep Conceal
127140
" Other Suggestions:
128141
" hi rustAssert ctermfg=yellow
129142
" hi rustMacro ctermfg=magenta

trunk/src/fuzzer/fuzzer.rc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
#[no_core];
66

7-
// NB: transitional for stage0:
8-
#[allow(unrecognized_lint)];
9-
#[warn(no_unrecognized_warning)];
10-
#[warn(no_vecs_not_implicitly_copyable)];
11-
// The new version:
127
#[allow(vecs_implicitly_copyable)];
138

149
use core(vers = "0.3");

trunk/src/libcore/core.rc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
// Don't link to core. We are core.
3232
#[no_core];
3333

34-
// NB: transitional for stage0:
35-
#[allow(unrecognized_lint)];
36-
#[warn(no_unrecognized_warning)];
37-
#[warn(no_vecs_not_implicitly_copyable)];
38-
// The new version:
3934
#[allow(vecs_implicitly_copyable)];
4035

4136
export int, i8, i16, i32, i64;

0 commit comments

Comments
 (0)