Skip to content

Commit 64462a7

Browse files
committed
---
yaml --- r: 49623 b: refs/heads/master c: a376f46 h: refs/heads/master i: 49621: ac2d744 49619: 7d18585 49615: 2d75d84 v: v3
1 parent bc93909 commit 64462a7

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
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: 142dbd65da9ae168c198162f0e1eec1c960e91f5
2+
refs/heads/master: a376f46862cef319ca6bb59b9b571e5e0ae55d8d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
55
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/librustc/middle/lang_items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub enum LangItem {
7878
}
7979

8080
pub struct LanguageItems {
81-
items: [ Option<def_id> * 35 ]
81+
items: [Option<def_id>, ..35]
8282
}
8383

8484
pub impl LanguageItems {

trunk/src/libsyntax/parse/obsolete.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ pub enum ObsoleteSyntax {
6161
ObsoletePurity,
6262
ObsoleteStaticMethod,
6363
ObsoleteConstItem,
64+
ObsoleteFixedLengthVectorType,
6465
}
6566

6667
impl to_bytes::IterBytes for ObsoleteSyntax {
@@ -209,6 +210,10 @@ pub impl Parser {
209210
"`const` items are now `static` items; replace `const` with \
210211
`static`"
211212
),
213+
ObsoleteFixedLengthVectorType => (
214+
"fixed-length vector notation",
215+
"instead of `[T * N]`, write `[T, ..N]`"
216+
),
212217
};
213218

214219
self.report(sp, kind, kind_str, desc);

trunk/src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ use parse::obsolete::{ObsoleteBareFnType, ObsoleteNewtypeEnum};
8181
use parse::obsolete::{ObsoleteMode, ObsoleteImplicitSelf};
8282
use parse::obsolete::{ObsoleteLifetimeNotation, ObsoleteConstManagedPointer};
8383
use parse::obsolete::{ObsoletePurity, ObsoleteStaticMethod};
84-
use parse::obsolete::{ObsoleteConstItem};
84+
use parse::obsolete::{ObsoleteConstItem, ObsoleteFixedLengthVectorType};
8585
use parse::prec::{as_prec, token_to_binop};
8686
use parse::token::{can_begin_expr, is_ident, is_ident_or_path};
8787
use parse::token::{is_plain_ident, INTERPOLATED, special_idents};
@@ -825,7 +825,7 @@ pub impl Parser {
825825

826826
fn maybe_parse_fixed_vstore(&self) -> Option<@ast::expr> {
827827
if self.eat(&token::BINOP(token::STAR)) {
828-
// XXX: Obsolete; remove after snapshot.
828+
self.obsolete(*self.last_span, ObsoleteFixedLengthVectorType);
829829
Some(self.parse_expr())
830830
} else if *self.token == token::COMMA &&
831831
self.look_ahead(1) == token::DOTDOT {

0 commit comments

Comments
 (0)