mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder source_str_to_stream arguments.

Browse Source 
It's the only one of these functions where `psess` isn't the first
argument.
This commit is contained in:
Nicholas Nethercote 2024-05-31 14:33:56 +10:00
parent 25972aec67
commit ab192a0c97
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_expand/src/proc_macro_server.rs
View File

@ -540,9 +540,9 @@ fn is_empty(&mut self, stream: &Self::TokenStream) -> bool {
fn from_str(&mut self, src: &str) -> Self::TokenStream { fn from_str(&mut self, src: &str) -> Self::TokenStream {
source_str_to_stream( source_str_to_stream(
self.psess(),
FileName::proc_macro_source_code(src), FileName::proc_macro_source_code(src),
src.to_string(), src.to_string(),
self.psess(),
Some(self.call_site), Some(self.call_site),
) )
} }

6
compiler/rustc_parse/src/lib.rs
View File

@ -95,9 +95,9 @@ fn maybe_new_parser_from_source_file(
} }
pub fn source_str_to_stream( pub fn source_str_to_stream(
psess: &ParseSess,
name: FileName, name: FileName,
source: String, source: String,
psess: &ParseSess,
override_span: Option<Span>, override_span: Option<Span>,
) -> TokenStream { ) -> TokenStream {
source_file_to_stream(psess, psess.source_map().new_source_file(name, source), override_span) 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 { pub fn fake_token_stream_for_item(psess: &ParseSess, item: &ast::Item) -> TokenStream {
let source = pprust::item_to_string(item); let source = pprust::item_to_string(item);
let filename = FileName::macro_expansion_source_code(&source); 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 { pub fn fake_token_stream_for_crate(psess: &ParseSess, krate: &ast::Crate) -> TokenStream {
let source = pprust::crate_to_string_for_macros(krate); let source = pprust::crate_to_string_for_macros(krate);
let filename = FileName::macro_expansion_source_code(&source); 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( pub fn parse_cfg_attr(

2
compiler/rustc_parse/src/parser/tests.rs
View File

@ -82,7 +82,7 @@ fn with_expected_parse_error<T, F>(source_str: &str, expected_output: &str, f: F
/// Maps a string to tts, using a made-up filename. /// Maps a string to tts, using a made-up filename.
pub(crate) fn string_to_stream(source_str: String) -> TokenStream { pub(crate) fn string_to_stream(source_str: String) -> TokenStream {
let psess = psess(); 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. /// Parses a string, returns a crate.

2
src/librustdoc/passes/lint/check_code_block_syntax.rs
View File

@ -51,7 +51,7 @@ fn check_rust_syntax(
let span = DUMMY_SP.apply_mark(expn_id.to_expn_id(), Transparency::Transparent); let span = DUMMY_SP.apply_mark(expn_id.to_expn_id(), Transparency::Transparent);
let is_empty = rustc_driver::catch_fatal_errors(|| { 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() .is_empty()
}) })
.unwrap_or(false); .unwrap_or(false);