user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Transition to new Hash, removing IterBytes and std::to_bytes.

Browse source
This commit is contained in:
Huon Wilson 2014-02-23 21:29:35 +11:00
parent 5444da54fd
commit efaf4db24c
50 changed files with 286 additions and 1321 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libsyntax/parse/obsolete.rs
View file

@ -22,10 +22,8 @@ use codemap::{Span, respan};
use parse::parser::Parser;
use parse::token;
use std::to_bytes;
/// The specific types of unsupported syntax
#[deriving(Eq)]
#[deriving(Eq, Hash)]
pub enum ObsoleteSyntax {
ObsoleteSwap,
ObsoleteUnsafeBlock,
@ -46,13 +44,6 @@ pub enum ObsoleteSyntax {
ObsoleteManagedVec,
}
impl to_bytes::IterBytes for ObsoleteSyntax {
#[inline]
fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) -> bool {
(*self as uint).iter_bytes(lsb0, f)
}
}
pub trait ParserObsoleteMethods {
/// Reports an obsolete syntax non-fatal error.
fn obsolete(&mut self, sp: Span, kind: ObsoleteSyntax);

8
src/libsyntax/parse/token.rs
View file

@ -23,7 +23,7 @@ use std::local_data;
use std::path::BytesContainer;
#[allow(non_camel_case_types)]
#[deriving(Clone, Encodable, Decodable, Eq, IterBytes)]
#[deriving(Clone, Encodable, Decodable, Eq, Hash)]
pub enum BinOp {
PLUS,
MINUS,
@ -38,7 +38,7 @@ pub enum BinOp {
}
#[allow(non_camel_case_types)]
#[deriving(Clone, Encodable, Decodable, Eq, IterBytes)]
#[deriving(Clone, Encodable, Decodable, Eq, Hash)]
pub enum Token {
/* Expression-operator symbols. */
EQ,
@ -102,7 +102,7 @@ pub enum Token {
EOF,
}
#[deriving(Clone, Encodable, Decodable, Eq, IterBytes)]
#[deriving(Clone, Encodable, Decodable, Eq, Hash)]
/// For interpolation during macro expansion.
pub enum Nonterminal {
NtItem(@ast::Item),
@ -536,7 +536,7 @@ pub fn get_ident_interner() -> @IdentInterner {
/// destroyed. In particular, they must not access string contents. This can
/// be fixed in the future by just leaking all strings until task death
/// somehow.
#[deriving(Clone, Eq, IterBytes, Ord, TotalEq, TotalOrd)]
#[deriving(Clone, Eq, Hash, Ord, TotalEq, TotalOrd)]
pub struct InternedString {
priv string: RcStr,
}