Skip to content

Commit 9d8105d

Browse files
committed
remove parser fluent from rustc_expand
1 parent bf3b14d commit 9d8105d

File tree

4 files changed

+7
-21
lines changed

4 files changed

+7
-21
lines changed

Diff for: compiler/rustc_expand/src/parse/tests.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ use rustc_span::{BytePos, FileName, Pos, Span};
2020
use std::path::PathBuf;
2121

2222
fn sess() -> ParseSess {
23-
ParseSess::new(
24-
vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
25-
FilePathMapping::empty(),
26-
)
23+
ParseSess::new(vec![crate::DEFAULT_LOCALE_RESOURCE], FilePathMapping::empty())
2724
}
2825

2926
/// Parses an item.

Diff for: compiler/rustc_expand/src/tests.rs

+4-12
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ fn string_to_parser(ps: &ParseSess, source_str: String) -> Parser<'_> {
2626
fn create_test_handler() -> (Handler, Lrc<SourceMap>, Arc<Mutex<Vec<u8>>>) {
2727
let output = Arc::new(Mutex::new(Vec::new()));
2828
let source_map = Lrc::new(SourceMap::new(FilePathMapping::empty()));
29-
let fallback_bundle = rustc_errors::fallback_fluent_bundle(
30-
vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
31-
false,
32-
);
29+
let fallback_bundle =
30+
rustc_errors::fallback_fluent_bundle(vec![crate::DEFAULT_LOCALE_RESOURCE], false);
3331
let emitter = EmitterWriter::new(Box::new(Shared { data: output.clone() }), fallback_bundle)
3432
.sm(Some(source_map.clone()))
3533
.diagnostic_width(Some(140));
@@ -72,10 +70,7 @@ where
7270

7371
/// Maps a string to tts, using a made-up filename.
7472
pub(crate) fn string_to_stream(source_str: String) -> TokenStream {
75-
let ps = ParseSess::new(
76-
vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
77-
FilePathMapping::empty(),
78-
);
73+
let ps = ParseSess::new(vec![crate::DEFAULT_LOCALE_RESOURCE], FilePathMapping::empty());
7974
source_file_to_stream(
8075
&ps,
8176
ps.source_map().new_source_file(PathBuf::from("bogofile").into(), source_str),
@@ -85,10 +80,7 @@ pub(crate) fn string_to_stream(source_str: String) -> TokenStream {
8580

8681
/// Parses a string, returns a crate.
8782
pub(crate) fn string_to_crate(source_str: String) -> ast::Crate {
88-
let ps = ParseSess::new(
89-
vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
90-
FilePathMapping::empty(),
91-
);
83+
let ps = ParseSess::new(vec![crate::DEFAULT_LOCALE_RESOURCE], FilePathMapping::empty());
9284
with_error_checking_parse(source_str, &ps, |p| p.parse_crate_mod())
9385
}
9486

Diff for: tests/ui-fulldeps/mod_dir_path_canonicalized.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ pub fn main() {
3131
}
3232

3333
fn parse() {
34-
let parse_session = ParseSess::new(
35-
vec![rustc_parse::DEFAULT_LOCALE_RESOURCE],
36-
FilePathMapping::empty()
37-
);
34+
let parse_session = ParseSess::new(vec![], FilePathMapping::empty());
3835

3936
let path = Path::new(file!());
4037
let path = path.canonicalize().unwrap();

Diff for: tests/ui-fulldeps/pprust-expr-roundtrip.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ fn main() {
225225
}
226226

227227
fn run() {
228-
let ps = ParseSess::new(vec![rustc_parse::DEFAULT_LOCALE_RESOURCE], FilePathMapping::empty());
228+
let ps = ParseSess::new(vec![], FilePathMapping::empty());
229229

230230
iter_exprs(2, &mut |mut e| {
231231
// If the pretty printer is correct, then `parse(print(e))` should be identical to `e`,

0 commit comments

Comments
 (0)