Reorder source_str_to_stream
arguments.
It's the only one of these functions where `psess` isn't the first argument.
This commit is contained in:
parent
25972aec67
commit
ab192a0c97
@ -540,9 +540,9 @@ fn is_empty(&mut self, stream: &Self::TokenStream) -> bool {
|
||||
|
||||
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),
|
||||
)
|
||||
}
|
||||
|
@ -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(
|
||||
|
@ -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.
|
||||
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.
|
||||
|
@ -51,7 +51,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);
|
||||
|
Loading…
Reference in New Issue
Block a user