about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-21 09:59:18 +0000
committerbors <bors@rust-lang.org>2015-07-21 09:59:18 +0000
commite33b128e01e1a5a2d23abac5b88274eea5cf9059 (patch)
treed0da3b98226376b52150853f61b4faee90446dc4 /src/libsyntax/ext
parent247a0d185446fb145e1e5843c44c97b9a564e135 (diff)
parentf47d20aecdcd7db34d41ad1666fd3eee095cc943 (diff)
downloadrust-e33b128e01e1a5a2d23abac5b88274eea5cf9059.tar.gz
rust-e33b128e01e1a5a2d23abac5b88274eea5cf9059.zip
Auto merge of #26816 - nrc:zero-codemap, r=@jroesch
See commits for details
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/source_util.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index 5418b1f43e4..22517dc5f1b 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -156,7 +156,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
             // dependency information
             let filename = format!("{}", file.display());
             let interned = token::intern_and_get_ident(&src[..]);
-            cx.codemap().new_filemap(filename, src);
+            cx.codemap().new_filemap_and_lines(&filename, &src);
 
             base::MacEager::expr(cx.expr_str(sp, interned))
         }
@@ -187,7 +187,7 @@ pub fn expand_include_bytes(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
             // Add this input file to the code map to make it available as
             // dependency information, but don't enter it's contents
             let filename = format!("{}", file.display());
-            cx.codemap().new_filemap(filename, "".to_string());
+            cx.codemap().new_filemap_and_lines(&filename, "");
 
             base::MacEager::expr(cx.expr_lit(sp, ast::LitBinary(Rc::new(bytes))))
         }