From a2654fb64c9c9d368063b488693d8da17bc9b4e9 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Wed, 5 May 2021 21:31:25 +0200
Subject: Rework SESSION_GLOBALS API to prevent overwriting it

---
 compiler/rustc_parse_format/src/tests.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'compiler/rustc_parse_format/src')

diff --git a/compiler/rustc_parse_format/src/tests.rs b/compiler/rustc_parse_format/src/tests.rs
index 9fd0497fffe..b7693a85ad9 100644
--- a/compiler/rustc_parse_format/src/tests.rs
+++ b/compiler/rustc_parse_format/src/tests.rs
@@ -144,8 +144,7 @@ fn format_align_fill() {
 }
 #[test]
 fn format_counts() {
-    use rustc_span::{edition, SessionGlobals, SESSION_GLOBALS};
-    SESSION_GLOBALS.set(&SessionGlobals::new(edition::DEFAULT_EDITION), || {
+    rustc_span::create_default_session_globals_then(|| {
         same(
             "{:10x}",
             &[NextArgument(Argument {
-- 
cgit 1.4.1-3-g733a5