diff options
| author | bors <bors@rust-lang.org> | 2013-07-31 22:52:31 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-31 22:52:31 -0700 |
| commit | 8ec70ae5de0e33ab62732c59b0b2b0620cb8dce9 (patch) | |
| tree | d3ec524a3c9192408a0400e723a5f59388774c9f /src/libsyntax/ext | |
| parent | 0c716c66fbd164bf0d96a77e2c6389f8f6702b23 (diff) | |
| parent | b57ffef37e6e2196ad948ab2f6944d242c3aaaf1 (diff) | |
| download | rust-8ec70ae5de0e33ab62732c59b0b2b0620cb8dce9.tar.gz rust-8ec70ae5de0e33ab62732c59b0b2b0620cb8dce9.zip | |
auto merge of #8162 : thestinger/rust/no-copy, r=brson
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/asm.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index bf7cccdc9ef..ee0ec664e1b 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -95,10 +95,10 @@ pub fn expand_asm(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree]) let constraint = p.parse_str(); p.expect(&token::LPAREN); - let in = p.parse_expr(); + let input = p.parse_expr(); p.expect(&token::RPAREN); - inputs.push((constraint, in)); + inputs.push((constraint, input)); } } Clobbers => { diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 1d5e12b0d41..4855911b9a8 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -750,16 +750,16 @@ pub fn std_macros() -> @str { macro_rules! condition ( - { pub $c:ident: $in:ty -> $out:ty; } => { + { pub $c:ident: $input:ty -> $out:ty; } => { pub mod $c { #[allow(non_uppercase_statics)]; static key: ::std::local_data::Key< - @::std::condition::Handler<$in, $out>> = + @::std::condition::Handler<$input, $out>> = &::std::local_data::Key; pub static cond : - ::std::condition::Condition<$in,$out> = + ::std::condition::Condition<$input,$out> = ::std::condition::Condition { name: stringify!($c), key: key @@ -767,17 +767,17 @@ pub fn std_macros() -> @str { } }; - { $c:ident: $in:ty -> $out:ty; } => { + { $c:ident: $input:ty -> $out:ty; } => { // FIXME (#6009): remove mod's `pub` below once variant above lands. pub mod $c { #[allow(non_uppercase_statics)]; static key: ::std::local_data::Key< - @::std::condition::Handler<$in, $out>> = + @::std::condition::Handler<$input, $out>> = &::std::local_data::Key; pub static cond : - ::std::condition::Condition<$in,$out> = + ::std::condition::Condition<$input,$out> = ::std::condition::Condition { name: stringify!($c), key: key |