Skip to content

Commit

Permalink
Put non-ascii identifiers behind a feature gate.
Browse files Browse the repository at this point in the history
  • Loading branch information
huonw committed Nov 22, 2013
1 parent efe9d74 commit ab2a99f
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 0 deletions.
11 changes: 11 additions & 0 deletions src/librustc/front/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use syntax::attr::AttrMetaMethods;
use syntax::codemap::Span;
use syntax::visit;
use syntax::visit::Visitor;
use syntax::parse::token;

use driver::session::Session;

Expand All @@ -36,6 +37,7 @@ static KNOWN_FEATURES: &'static [(&'static str, Status)] = &[
("once_fns", Active),
("asm", Active),
("managed_boxes", Active),
("non_ascii_idents", Active),

// These are used to test this portion of the compiler, they don't actually
// mean anything
Expand Down Expand Up @@ -76,6 +78,15 @@ impl Context {
}

impl Visitor<()> for Context {
fn visit_ident(&mut self, sp: Span, id: ast::Ident, _: ()) {
let s = token::ident_to_str(&id);

if !s.is_ascii() {
self.gate_feature("non_ascii_idents", sp,
"non-ascii idents are not fully supported.");
}
}

fn visit_view_item(&mut self, i: &ast::view_item, _: ()) {
match i.node {
ast::view_item_use(ref paths) => {
Expand Down
47 changes: 47 additions & 0 deletions src/test/compile-fail/gated-non-ascii-idents.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// xfail-fast feature doesn't work.

#[feature(struct_variant)];

extern mod bäz; //~ ERROR non-ascii idents

use föö::bar; //~ ERROR non-ascii idents

mod föö { //~ ERROR non-ascii idents
pub fn bar() {}
}

fn bär( //~ ERROR non-ascii idents
bäz: int //~ ERROR non-ascii idents
) {
let: int; //~ ERROR non-ascii idents

match (1, 2) {
(, _) => {} //~ ERROR non-ascii idents
}
}

struct Föö { //~ ERROR non-ascii idents
föö: int //~ ERROR non-ascii idents
}

enum Bär { //~ ERROR non-ascii idents
Bäz { //~ ERROR non-ascii idents
qüx: int //~ ERROR non-ascii idents
}
}

extern {
fn qüx(); //~ ERROR non-ascii idents
}

fn main() {}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// xfail-fast feature doesn't work.

#[forbid(non_camel_case_types)];
#[forbid(non_uppercase_statics)];
#[feature(non_ascii_idents)];

// Some scripts (e.g. hiragana) don't have a concept of
// upper/lowercase
Expand Down
4 changes: 4 additions & 0 deletions src/test/run-pass/utf8_idents.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// xfail-fast feature doesn't work.

#[feature(non_ascii_idents)];

use std::num;

pub fn main() {
Expand Down

0 comments on commit ab2a99f

Please sign in to comment.