From 0d4ebe1c1bec2d147bf5b1411a30403d68f64c63 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Mon, 4 Mar 2024 16:26:51 +1100 Subject: [PATCH] Move `sess` function and use it more. --- compiler/rustc_expand/src/parse/tests.rs | 8 ++------ compiler/rustc_expand/src/tests.rs | 10 ++++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/compiler/rustc_expand/src/parse/tests.rs b/compiler/rustc_expand/src/parse/tests.rs index 997144e477f..5ffe8f3c73e 100644 --- a/compiler/rustc_expand/src/parse/tests.rs +++ b/compiler/rustc_expand/src/parse/tests.rs @@ -1,5 +1,6 @@ use crate::tests::{ - matches_codepattern, string_to_stream, with_error_checking_parse, with_expected_parse_error, + matches_codepattern, sess, string_to_stream, with_error_checking_parse, + with_expected_parse_error, }; use ast::token::IdentIsRaw; @@ -16,13 +17,8 @@ use rustc_span::create_default_session_globals_then; use rustc_span::symbol::{kw, sym, Symbol}; use rustc_span::{BytePos, FileName, Pos, Span}; - use std::path::PathBuf; -fn sess() -> ParseSess { - ParseSess::new(vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE]) -} - /// Parses an item. /// /// Returns `Ok(Some(item))` when successful, `Ok(None)` when no item was found, and `Err` diff --git a/compiler/rustc_expand/src/tests.rs b/compiler/rustc_expand/src/tests.rs index ad60e5691ef..7d19ca13c97 100644 --- a/compiler/rustc_expand/src/tests.rs +++ b/compiler/rustc_expand/src/tests.rs @@ -18,6 +18,10 @@ use std::str; use std::sync::{Arc, Mutex}; +pub(crate) fn sess() -> ParseSess { + ParseSess::new(vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE]) +} + /// Map string to parser (via tts). fn string_to_parser(ps: &ParseSess, source_str: String) -> Parser<'_> { new_parser_from_source_str(ps, PathBuf::from("bogofile").into(), source_str) @@ -72,8 +76,7 @@ pub(crate) fn with_expected_parse_error(source_str: &str, expected_output: /// Maps a string to tts, using a made-up filename. pub(crate) fn string_to_stream(source_str: String) -> TokenStream { - let ps = - ParseSess::new(vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE]); + let ps = sess(); source_file_to_stream( &ps, ps.source_map().new_source_file(PathBuf::from("bogofile").into(), source_str), @@ -83,8 +86,7 @@ pub(crate) fn string_to_stream(source_str: String) -> TokenStream { /// Parses a string, returns a crate. pub(crate) fn string_to_crate(source_str: String) -> ast::Crate { - let ps = - ParseSess::new(vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE]); + let ps = sess(); with_error_checking_parse(source_str, &ps, |p| p.parse_crate_mod()) }