diff --git a/compiler/rustc_expand/src/proc_macro_server.rs b/compiler/rustc_expand/src/proc_macro_server.rs
index a0cb0ae447304..e6c59f1b3613e 100644
--- a/compiler/rustc_expand/src/proc_macro_server.rs
+++ b/compiler/rustc_expand/src/proc_macro_server.rs
@@ -541,9 +541,9 @@ impl server::TokenStream for Rustc<'_, '_> {
 
     fn from_str(&mut self, src: &str) -> Self::TokenStream {
         source_str_to_stream(
+            self.psess(),
             FileName::proc_macro_source_code(src),
             src.to_string(),
-            self.psess(),
             Some(self.call_site),
         )
     }
diff --git a/compiler/rustc_parse/src/lib.rs b/compiler/rustc_parse/src/lib.rs
index b804e77e7a4e5..5ba6db3b2620b 100644
--- a/compiler/rustc_parse/src/lib.rs
+++ b/compiler/rustc_parse/src/lib.rs
@@ -95,9 +95,9 @@ fn maybe_new_parser_from_source_file(
 }
 
 pub fn source_str_to_stream(
+    psess: &ParseSess,
     name: FileName,
     source: String,
-    psess: &ParseSess,
     override_span: Option<Span>,
 ) -> TokenStream {
     source_file_to_stream(psess, psess.source_map().new_source_file(name, source), override_span)
@@ -147,13 +147,13 @@ pub fn parse_in<'a, T>(
 pub fn fake_token_stream_for_item(psess: &ParseSess, item: &ast::Item) -> TokenStream {
     let source = pprust::item_to_string(item);
     let filename = FileName::macro_expansion_source_code(&source);
-    source_str_to_stream(filename, source, psess, Some(item.span))
+    source_str_to_stream(psess, filename, source, Some(item.span))
 }
 
 pub fn fake_token_stream_for_crate(psess: &ParseSess, krate: &ast::Crate) -> TokenStream {
     let source = pprust::crate_to_string_for_macros(krate);
     let filename = FileName::macro_expansion_source_code(&source);
-    source_str_to_stream(filename, source, psess, Some(krate.spans.inner_span))
+    source_str_to_stream(psess, filename, source, Some(krate.spans.inner_span))
 }
 
 pub fn parse_cfg_attr(
diff --git a/compiler/rustc_parse/src/parser/tests.rs b/compiler/rustc_parse/src/parser/tests.rs
index b72cfd63d00db..2900d44089ea7 100644
--- a/compiler/rustc_parse/src/parser/tests.rs
+++ b/compiler/rustc_parse/src/parser/tests.rs
@@ -82,7 +82,7 @@ where
 /// Maps a string to tts, using a made-up filename.
 pub(crate) fn string_to_stream(source_str: String) -> TokenStream {
     let psess = psess();
-    source_str_to_stream(PathBuf::from("bogofile").into(), source_str, &psess, None)
+    source_str_to_stream(&psess, PathBuf::from("bogofile").into(), source_str, None)
 }
 
 /// Parses a string, returns a crate.
diff --git a/src/librustdoc/passes/lint/check_code_block_syntax.rs b/src/librustdoc/passes/lint/check_code_block_syntax.rs
index e4f8e5f7b1e4f..d9c7580341d53 100644
--- a/src/librustdoc/passes/lint/check_code_block_syntax.rs
+++ b/src/librustdoc/passes/lint/check_code_block_syntax.rs
@@ -53,7 +53,7 @@ fn check_rust_syntax(
     let span = DUMMY_SP.apply_mark(expn_id.to_expn_id(), Transparency::Transparent);
 
     let is_empty = rustc_driver::catch_fatal_errors(|| {
-        source_str_to_stream(FileName::Custom(String::from("doctest")), source, &psess, Some(span))
+        source_str_to_stream(&psess, FileName::Custom(String::from("doctest")), source, Some(span))
             .is_empty()
     })
     .unwrap_or(false);