rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make untracked.source_span lockable so that resolution can still write to it when using TyCtxt

Browse Source
This commit is contained in:
Oli Scherer
2022-12-08 11:02:47 +00:00
parent ade3dceb38
commit 6924e3c374
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_resolve/src/diagnostics.rs
View File

@@ -155,7 +155,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
if !candidates.is_empty() {
show_candidates(
&self.tcx.sess,
&self.untracked.source_span,
&self.untracked.source_span.read(),
&mut err,
span,
&candidates,
@@ -688,7 +688,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
}
show_candidates(
&self.tcx.sess,
&self.untracked.source_span,
&self.untracked.source_span.read(),
&mut err,
Some(span),
&import_suggestions,
@@ -1353,7 +1353,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
self.lookup_import_candidates(ident, Namespace::MacroNS, parent_scope, is_expected);
show_candidates(
&self.tcx.sess,
&self.untracked.source_span,
&self.untracked.source_span.read(),
err,
None,
&import_suggestions,