about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-17 08:54:22 +0000
committerbors <bors@rust-lang.org>2018-03-17 08:54:22 +0000
commitc3fd5d0ddead5b14ce5321b06bc5bed60d0cdf2f (patch)
treef4fd63a65fc416b01bd812f528c8758642d56ac6 /src/libsyntax/parse
parent8cabda4ce8d675868acff69e69250ad0b08d059b (diff)
parent65b49902538b319f9fb07532beff9d02efd3197f (diff)
downloadrust-c3fd5d0ddead5b14ce5321b06bc5bed60d0cdf2f.tar.gz
rust-c3fd5d0ddead5b14ce5321b06bc5bed60d0cdf2f.zip
Auto merge of #48904 - Zoxc:code-and-file-maps, r=michaelwoerister
Make CodeMap and FileMap thread-safe

r? @michaelwoerister
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index d0075c89656..815ba49a60a 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -611,7 +611,7 @@ impl<'a> StringReader<'a> {
                 // I guess this is the only way to figure out if
                 // we're at the beginning of the file...
                 let cmap = CodeMap::new(FilePathMapping::empty());
-                cmap.files.borrow_mut().push(self.filemap.clone());
+                cmap.files.borrow_mut().file_maps.push(self.filemap.clone());
                 let loc = cmap.lookup_char_pos_adj(self.pos);
                 debug!("Skipping a shebang");
                 if loc.line == 1 && loc.col == CharPos(0) {