diff options
| author | bors <bors@rust-lang.org> | 2018-08-19 23:08:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-19 23:08:26 +0000 |
| commit | 6bf6d50a6ff7685b4aa09172d9d09f03f250da9d (patch) | |
| tree | 45b651039eb9347abbb53fff215e936c402653a9 /src/libsyntax/util/parser_testing.rs | |
| parent | f28f648a9699db67b86735f97d609c3dd06f9ded (diff) | |
| parent | 6138c82803a77a44e0a56cd8999299fa7f214afe (diff) | |
| download | rust-6bf6d50a6ff7685b4aa09172d9d09f03f250da9d.tar.gz rust-6bf6d50a6ff7685b4aa09172d9d09f03f250da9d.zip | |
Auto merge of #52953 - dsciarra:mv-codemap-sourcemap, r=petrochenkov
Rename CodeMap/FileMap to SourceMap/SourceFile A first renaming for #51574
Diffstat (limited to 'src/libsyntax/util/parser_testing.rs')
| -rw-r--r-- | src/libsyntax/util/parser_testing.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index 46b7f2d7bda..374154e6333 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -9,8 +9,8 @@ // except according to those terms. use ast::{self, Ident}; -use codemap::FilePathMapping; -use parse::{ParseSess, PResult, filemap_to_stream}; +use source_map::FilePathMapping; +use parse::{ParseSess, PResult, source_file_to_stream}; use parse::{lexer, new_parser_from_source_str}; use parse::parser::Parser; use ptr::P; @@ -21,8 +21,8 @@ use std::path::PathBuf; /// Map a string to tts, using a made-up filename: pub fn string_to_stream(source_str: String) -> TokenStream { let ps = ParseSess::new(FilePathMapping::empty()); - filemap_to_stream(&ps, ps.codemap() - .new_filemap(PathBuf::from("bogofile").into(), source_str), None) + source_file_to_stream(&ps, ps.source_map() + .new_source_file(PathBuf::from("bogofile").into(), source_str), None) } /// Map string to parser (via tts) |
