about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-11-18 14:14:40 -0800
committerBrian Anderson <banderson@mozilla.com>2012-11-18 18:09:41 -0800
commit74b2e9979738ce413209aa4342fc35afe68c68de (patch)
tree1a6c24b0e8ea072cb651f60170e420e1a64686ae /src/libsyntax/ext
parent72cc1aca175044ceb003a8b270940bec1da85460 (diff)
downloadrust-74b2e9979738ce413209aa4342fc35afe68c68de.tar.gz
rust-74b2e9979738ce413209aa4342fc35afe68c68de.zip
Report errors better when failing to open files for sub-parsers
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/source_util.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index baf92175e7d..1bd3ec8423e 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -58,9 +58,10 @@ fn expand_include(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
                   _body: ast::mac_body) -> @ast::expr {
     let args = get_mac_args(cx, sp, arg, 1u, option::Some(1u), ~"include");
     let file = expr_to_str(cx, args[0], ~"include_str! requires a string");
-    let p = parse::new_parser_from_file(cx.parse_sess(), cx.cfg(),
-                                        &res_rel_file(cx, sp, &Path(file)),
-                                        parse::parser::SOURCE_FILE);
+    let p = parse::new_sub_parser_from_file(
+        cx.parse_sess(), cx.cfg(),
+        &res_rel_file(cx, sp, &Path(file)),
+        parse::parser::SOURCE_FILE, sp);
     return p.parse_expr();
 }