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

Rename a misnamed Session parameter.

Browse Source
This commit is contained in:
Nicholas Nethercote 2024-03-04 16:32:37 +11:00
parent 0d4ebe1c1b
commit 4260f7ec67
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_expand/src/base.rs
View File

@ -1217,7 +1217,7 @@ pub fn check_unused_macros(&mut self) {
/// ///
/// This unifies the logic used for resolving `include_X!`. /// This unifies the logic used for resolving `include_X!`.
pub fn resolve_path( pub fn resolve_path(
parse_sess: &Session, sess: &Session,
path: impl Into<PathBuf>, path: impl Into<PathBuf>,
span: Span, span: Span,
) -> PResult<'_, PathBuf> { ) -> PResult<'_, PathBuf> {
@ -1227,15 +1227,15 @@ pub fn resolve_path(
// after macro expansion (that is, they are unhygienic). // after macro expansion (that is, they are unhygienic).
if !path.is_absolute() { if !path.is_absolute() {
let callsite = span.source_callsite(); let callsite = span.source_callsite();
let mut result = match parse_sess.source_map().span_to_filename(callsite) { let mut result = match sess.source_map().span_to_filename(callsite) {
FileName::Real(name) => name FileName::Real(name) => name
.into_local_path() .into_local_path()
.expect("attempting to resolve a file path in an external file"), .expect("attempting to resolve a file path in an external file"),
FileName::DocTest(path, _) => path, FileName::DocTest(path, _) => path,
other => { other => {
return Err(parse_sess.dcx().create_err(errors::ResolveRelativePath { return Err(sess.dcx().create_err(errors::ResolveRelativePath {
span, span,
path: parse_sess.source_map().filename_for_diagnostics(&other).to_string(), path: sess.source_map().filename_for_diagnostics(&other).to_string(),
})); }));
} }
}; };