Skip to content

Commit e83c8cb

Browse files
committed
Move ResolverOutputs out of rustc_middle.
It's not used in `rustc_middle`, and `rustc_resolve` is a better place for it.
1 parent 2bf10de commit e83c8cb

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

compiler/rustc_interface/src/passes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use rustc_parse::{
2929
new_parser_from_file, new_parser_from_source_str, unwrap_or_emit_fatal, validate_attr,
3030
};
3131
use rustc_passes::{abi_test, input_stats, layout_test};
32-
use rustc_resolve::Resolver;
32+
use rustc_resolve::{Resolver, ResolverOutputs};
3333
use rustc_session::config::{CrateType, Input, OutFileName, OutputFilenames, OutputType};
3434
use rustc_session::cstore::Untracked;
3535
use rustc_session::output::{collect_crate_types, filename_for_input};
@@ -793,7 +793,7 @@ fn resolver_for_lowering_raw<'tcx>(
793793
// Make sure we don't mutate the cstore from here on.
794794
tcx.untracked().cstore.freeze();
795795

796-
let ty::ResolverOutputs {
796+
let ResolverOutputs {
797797
global_ctxt: untracked_resolutions,
798798
ast_lowering: untracked_resolver_for_lowering,
799799
} = resolver.into_outputs();

compiler/rustc_middle/src/ty/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,6 @@ mod visit;
170170

171171
// Data types
172172

173-
pub struct ResolverOutputs {
174-
pub global_ctxt: ResolverGlobalCtxt,
175-
pub ast_lowering: ResolverAstLowering,
176-
}
177-
178173
#[derive(Debug, HashStable)]
179174
pub struct ResolverGlobalCtxt {
180175
pub visibilities_for_hashing: Vec<(LocalDefId, Visibility)>,

compiler/rustc_resolve/src/lib.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ use rustc_middle::middle::privacy::EffectiveVisibilities;
6464
use rustc_middle::query::Providers;
6565
use rustc_middle::span_bug;
6666
use rustc_middle::ty::{
67-
self, DelegationFnSig, Feed, MainDefinition, RegisteredTools, ResolverGlobalCtxt,
68-
ResolverOutputs, TyCtxt, TyCtxtFeed, Visibility,
67+
self, DelegationFnSig, Feed, MainDefinition, RegisteredTools, ResolverAstLowering,
68+
ResolverGlobalCtxt, TyCtxt, TyCtxtFeed, Visibility,
6969
};
7070
use rustc_query_system::ich::StableHashingContext;
7171
use rustc_session::lint::builtin::PRIVATE_MACRO_USE;
@@ -1037,6 +1037,11 @@ impl MacroData {
10371037
}
10381038
}
10391039

1040+
pub struct ResolverOutputs {
1041+
pub global_ctxt: ResolverGlobalCtxt,
1042+
pub ast_lowering: ResolverAstLowering,
1043+
}
1044+
10401045
/// The main resolver class.
10411046
///
10421047
/// This is the visitor that walks the whole crate.

0 commit comments

Comments
 (0)