bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Replace two create_default_session_if_not_set_then uses.

Browse source 
With `create_default_session_globals_then`, which is preferable when it
is appropriate.
This commit is contained in:
Nicholas Nethercote 2023-11-02 15:24:04 +11:00
parent edb357f912
commit 9893b75e0d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_expand/src/tests.rs
View file

@ -2,7 +2,7 @@ use rustc_ast as ast;
use rustc_ast::tokenstream::TokenStream; use rustc_ast::tokenstream::TokenStream;
use rustc_parse::{new_parser_from_source_str, parser::Parser, source_file_to_stream}; use rustc_parse::{new_parser_from_source_str, parser::Parser, source_file_to_stream};
use rustc_session::parse::ParseSess; use rustc_session::parse::ParseSess;
use rustc_span::create_default_session_if_not_set_then; use rustc_span::create_default_session_globals_then;
use rustc_span::source_map::{FilePathMapping, SourceMap}; use rustc_span::source_map::{FilePathMapping, SourceMap};
use rustc_span::{BytePos, Span}; use rustc_span::{BytePos, Span};
@ -181,7 +181,7 @@ impl<T: Write> Write for Shared<T> {
} }
fn test_harness(file_text: &str, span_labels: Vec<SpanLabel>, expected_output: &str) { fn test_harness(file_text: &str, span_labels: Vec<SpanLabel>, expected_output: &str) {
create_default_session_if_not_set_then(|_| { create_default_session_globals_then(|| {
let (handler, source_map, output) = create_test_handler(); let (handler, source_map, output) = create_test_handler();
source_map.new_source_file(Path::new("test.rs").to_owned().into(), file_text.to_owned()); source_map.new_source_file(Path::new("test.rs").to_owned().into(), file_text.to_owned());

4
compiler/rustc_hir/src/tests.rs
View file

@ -2,7 +2,7 @@ use crate::definitions::{DefKey, DefPathData, DisambiguatedDefPathData};
use rustc_data_structures::stable_hasher::Hash64; use rustc_data_structures::stable_hasher::Hash64;
use rustc_span::def_id::{DefPathHash, StableCrateId}; use rustc_span::def_id::{DefPathHash, StableCrateId};
use rustc_span::edition::Edition; use rustc_span::edition::Edition;
use rustc_span::{create_session_if_not_set_then, Symbol}; use rustc_span::{create_session_globals_then, Symbol};
#[test] #[test]
fn def_path_hash_depends_on_crate_id() { fn def_path_hash_depends_on_crate_id() {
@ -14,7 +14,7 @@ fn def_path_hash_depends_on_crate_id() {
// the crate by changing the crate disambiguator (e.g. via bumping the // the crate by changing the crate disambiguator (e.g. via bumping the
// crate's version number). // crate's version number).
create_session_if_not_set_then(Edition::Edition2024, |_| { create_session_globals_then(Edition::Edition2024, || {
let id0 = StableCrateId::new(Symbol::intern("foo"), false, vec!["1".to_string()], ""); let id0 = StableCrateId::new(Symbol::intern("foo"), false, vec!["1".to_string()], "");
let id1 = StableCrateId::new(Symbol::intern("foo"), false, vec!["2".to_string()], ""); let id1 = StableCrateId::new(Symbol::intern("foo"), false, vec!["2".to_string()], "");