about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-23 19:20:58 -0700
committerbors <bors@rust-lang.org>2013-09-23 19:20:58 -0700
commitd062de8aa48083439237cb338b38c25306bf6c94 (patch)
tree1ced905a1f2255a3f5207ed6c70fbe5e80cf4b41 /src/libsyntax/parse
parent348d8446739f9633897a3d728d265ee6ac59c8fb (diff)
parent3b1d3e5bf8e2f288147fd879b37bc5e6f8c5528f (diff)
downloadrust-d062de8aa48083439237cb338b38c25306bf6c94.tar.gz
rust-d062de8aa48083439237cb338b38c25306bf6c94.zip
auto merge of #9310 : pcwalton/rust/at-fn, r=pcwalton
r? @brson
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 9645dab4e8b..91ef55c78f6 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -45,7 +45,7 @@ pub struct ParseSess {
     included_mod_stack: ~[Path],
 }
 
-pub fn new_parse_sess(demitter: Option<Emitter>) -> @mut ParseSess {
+pub fn new_parse_sess(demitter: Option<@Emitter>) -> @mut ParseSess {
     let cm = @CodeMap::new();
     @mut ParseSess {
         cm: cm,