Rework SESSION_GLOBALS API to prevent overwriting it

GuillaumeGomez · GuillaumeGomez · commit abf449ffa657 · 2021-07-08T16:16:28.000+02:00
diff --git a/src/formatting.rs b/src/formatting.rs
@@ -34,7 +34,7 @@ impl<'b, T: Write + 'b> Session<'b, T> {
             return Err(ErrorKind::VersionMismatch);
         }
 
-        rustc_span::with_session_globals(self.config.edition().into(), || {
+        rustc_span::create_session_if_not_set_then(self.config.edition().into(), |_| {
             if self.config.disable_all_formatting() {
                 // When the input is from stdin, echo back the input.
                 if let Input::Text(ref buf) = input {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ impl<'b, T: Write + 'b> Session<'b, T> {`
`34`	`34`	`return Err(ErrorKind::VersionMismatch);`
`35`	`35`	`}`
`36`	`36`
`37`		`- rustc_span::with_session_globals(self.config.edition().into(), \|\| {`
	`37`	`+ rustc_span::create_session_if_not_set_then(self.config.edition().into(), \|_\| {`
`38`	`38`	`if self.config.disable_all_formatting() {`
`39`	`39`	`// When the input is from stdin, echo back the input.`
`40`	`40`	`if let Input::Text(ref buf) = input {`