diff options
| author | bors <bors@rust-lang.org> | 2015-01-04 04:50:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-04 04:50:56 +0000 |
| commit | 470118f3e915cdc8f936aca0640b28a7a3d8dc6c (patch) | |
| tree | 47f99908d999aa612a4cd44932dcdc3b3a1a966a /src/libsyntax/parse/lexer | |
| parent | c6c786671d692d7b13c2e5c68a53001327b4b125 (diff) | |
| parent | 351409a62287c7993bc680d9dfcfa13cba9c9c0c (diff) | |
| download | rust-470118f3e915cdc8f936aca0640b28a7a3d8dc6c.tar.gz rust-470118f3e915cdc8f936aca0640b28a7a3d8dc6c.zip | |
auto merge of #20504 : japaric/rust/derive-self, r=alexcrichton
I put the sed scripts in the commits, in case this needs a "rebase".
Diffstat (limited to 'src/libsyntax/parse/lexer')
| -rw-r--r-- | src/libsyntax/parse/lexer/comments.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs index b8da8365f7e..0d5592b57b1 100644 --- a/src/libsyntax/parse/lexer/comments.rs +++ b/src/libsyntax/parse/lexer/comments.rs @@ -24,7 +24,7 @@ use std::str; use std::string::String; use std::uint; -#[deriving(Clone, Copy, PartialEq)] +#[derive(Clone, Copy, PartialEq)] pub enum CommentStyle { /// No code on either side of each line of the comment Isolated, @@ -36,7 +36,7 @@ pub enum CommentStyle { BlankLine, } -#[deriving(Clone)] +#[derive(Clone)] pub struct Comment { pub style: CommentStyle, pub lines: Vec<String>, @@ -327,7 +327,7 @@ fn consume_comment(rdr: &mut StringReader, debug!("<<< consume comment"); } -#[deriving(Clone)] +#[derive(Clone)] pub struct Literal { pub lit: String, pub pos: BytePos, diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 0f5ff33021c..46a124074c7 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -51,7 +51,7 @@ pub trait Reader { } } -#[deriving(Clone, PartialEq, Eq, Show)] +#[derive(Clone, PartialEq, Eq, Show)] pub struct TokenAndSpan { pub tok: token::Token, pub sp: Span, |