diff options
| author | bors <bors@rust-lang.org> | 2013-02-20 21:22:30 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-20 21:22:30 -0800 |
| commit | a02da4ecdef0bc810357db3566f97e9cc1f24c46 (patch) | |
| tree | e61b61fe772d4454a0901fbe48a4828933e5a0eb /src/libsyntax/ext | |
| parent | 0aa1aaa2c1d095365e341017e443d61a960e0af6 (diff) | |
| parent | bf2a225c0b6f90f61bcaf4a6f33d9eaf424795b6 (diff) | |
| download | rust-a02da4ecdef0bc810357db3566f97e9cc1f24c46.tar.gz rust-a02da4ecdef0bc810357db3566f97e9cc1f24c46.zip | |
auto merge of #5063 : pcwalton/rust/plussing, r=pcwalton
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/auto_encode.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/ext/pipes/ast_builder.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs index 9ceaebe6dd1..7fbba987cc7 100644 --- a/src/libsyntax/ext/auto_encode.rs +++ b/src/libsyntax/ext/auto_encode.rs @@ -23,7 +23,7 @@ For example, a type like: would generate two implementations like: -impl<S: std::serialize::Encoder> Encodable<S> for Node { +impl<S:std::serialize::Encoder> Encodable<S> for Node { fn encode(&self, s: &S) { do s.emit_struct("Node", 1) { s.emit_field("id", 0, || s.emit_uint(self.id)) @@ -31,7 +31,7 @@ impl<S: std::serialize::Encoder> Encodable<S> for Node { } } -impl<D: Decoder> Decodable for node_id { +impl<D:Decoder> Decodable for node_id { static fn decode(d: &D) -> Node { do d.read_struct("Node", 1) { Node { @@ -54,7 +54,7 @@ would yield functions like: S: Encoder, T: Encodable<S> > spanned<T>: Encodable<S> { - fn encode<S: Encoder>(s: &S) { + fn encode<S:Encoder>(s: &S) { do s.emit_rec { s.emit_field("node", 0, || self.node.encode(s)); s.emit_field("span", 1, || self.span.encode(s)); diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs index f4d0e57c595..49f7fe5853e 100644 --- a/src/libsyntax/ext/pipes/ast_builder.rs +++ b/src/libsyntax/ext/pipes/ast_builder.rs @@ -319,7 +319,7 @@ pub impl ext_ctxt_ast_builder for ext_ctxt { +items: ~[@ast::item]) -> @ast::item { // XXX: Total hack: import `core::kinds::Owned` to work around a - // parser bug whereby `fn f<T: ::kinds::Owned>` doesn't parse. + // parser bug whereby `fn f<T:::kinds::Owned>` doesn't parse. let vi = ast::view_item_use(~[ @codemap::spanned { node: ast::view_path_simple( |