Skip to content

Various ObligationForest improvements #64500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 17, 2019
Merged

Various ObligationForest improvements #64500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
04b1111
Name index variables consistently.
nnethercote Sep 16, 2019
43c0d2c
Redefine `NodeIndex` as a `newtype_index!`.
nnethercote Sep 16, 2019
1936e44
Factor out repeated `self.nodes[i]` expressions.
nnethercote Sep 16, 2019
3fda957
Remove out-of-date comments.
nnethercote Sep 16, 2019
ac061dc
Fix some out-of-date names of things in comments.
nnethercote Sep 16, 2019
6391ef4
Fix incorrect comment about contents of a `Node`.
nnethercote Sep 16, 2019
e2492b7
Add comments about `waiting_cache`.
nnethercote Sep 16, 2019
6e48053
Use iterators in `error_at` and `process_cycle`.
nnethercote Sep 16, 2019
f22bb2e
Use `retain` for `waiting_cache` in `apply_rewrites()`.
nnethercote Sep 16, 2019
201afa6
Minor comment tweaks.
nnethercote Sep 16, 2019
4ecd94e
Move `impl Node` just after `struct Node`.
nnethercote Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc_data_structures/indexed_vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ macro_rules! newtype_index {

#[inline]
$v const unsafe fn from_u32_unchecked(value: u32) -> Self {
unsafe { $type { private: value } }
$type { private: value }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not needed because the function itself is unsafe, so it's allowed to have unsafe operations in the body

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough. The obvious follow-up question is "why didn't the compiler complain about this before?"

}

/// Extracts the value of this index as an integer.
Expand Down
6 changes: 3 additions & 3 deletions src/librustc_data_structures/obligation_forest/graphviz.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ impl<'a, O: ForestObligation + 'a> dot::GraphWalk<'a> for &'a ObligationForest<O
.flat_map(|i| {
let node = &self.nodes[i];

node.parent.iter().map(|p| p.get())
.chain(node.dependents.iter().map(|p| p.get()))
.map(move |p| (p, i))
node.parent.iter()
.chain(node.dependents.iter())
.map(move |p| (p.index(), i))
})
.collect()
}
Expand Down
Loading