nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not store overlap_mode, just pass it down on insert

Browse Source
This commit is contained in:
Santiago Pastorino 2022-01-31 11:51:34 -03:00
parent a9bfb5d837
commit 0decf14ef1
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_middle/src/traits/specialization_graph.rs
View File

@ -32,23 +32,11 @@ pub struct Graph {
/// Whether an error was emitted while constructing the graph.
pub has_errored: bool,
/// Overlap mode to be used
pub overlap_mode: OverlapMode,
}
impl Graph {
pub fn new() -> Graph {
Graph {
parent: Default::default(),
children: Default::default(),
has_errored: false,
overlap_mode: OverlapMode::Stable,
}
}
pub fn set_overlap_mode(&mut self, overlap_mode: OverlapMode) {
self.overlap_mode = overlap_mode;
Graph { parent: Default::default(), children: Default::default(), has_errored: false }
}
/// The parent of a given impl, which is the `DefId` of the trait when the

4
compiler/rustc_trait_selection/src/traits/specialize/mod.rs
View File

@ -257,7 +257,7 @@ pub(super) fn specialization_graph_provider(
trait_id: DefId,
) -> specialization_graph::Graph {
let mut sg = specialization_graph::Graph::new();
sg.set_overlap_mode(specialization_graph::OverlapMode::get(tcx, trait_id));
let overlap_mode = specialization_graph::OverlapMode::get(tcx, trait_id);
let mut trait_impls: Vec<_> = tcx.all_impls(trait_id).collect();
@ -271,7 +271,7 @@ pub(super) fn specialization_graph_provider(
for impl_def_id in trait_impls {
if let Some(impl_def_id) = impl_def_id.as_local() {
// This is where impl overlap checking happens:
let insert_result = sg.insert(tcx, impl_def_id.to_def_id());
let insert_result = sg.insert(tcx, impl_def_id.to_def_id(), overlap_mode);
// Report error if there was one.
let (overlap, used_to_be_allowed) = match insert_result {
Err(overlap) => (Some(overlap), None),

4
compiler/rustc_trait_selection/src/traits/specialize/specialization_graph.rs
View File

@ -277,6 +277,7 @@ pub trait GraphExt {
&mut self,
tcx: TyCtxt<'_>,
impl_def_id: DefId,
overlap_mode: OverlapMode,
) -> Result<Option<FutureCompatOverlapError>, OverlapError>;
/// Insert cached metadata mapping from a child impl back to its parent.
@ -291,6 +292,7 @@ impl GraphExt for Graph {
&mut self,
tcx: TyCtxt<'_>,
impl_def_id: DefId,
overlap_mode: OverlapMode,
) -> Result<Option<FutureCompatOverlapError>, OverlapError> {
assert!(impl_def_id.is_local());
@ -335,7 +337,7 @@ impl GraphExt for Graph {
tcx,
impl_def_id,
simplified,
self.overlap_mode,
overlap_mode,
)?;
match insert_result {