Skip to content
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.

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

Rollup of 6 pull requests #129092

Merged
merged 20 commits into from
Aug 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7b86c98
do not use the global solver cache for proof trees
lcnr Jul 23, 2024
51338ca
expand fuzzing support
lcnr Jul 23, 2024
e87157b
simplify match + move `debug!` call
lcnr Jul 23, 2024
9308401
tracing: debug to trace
lcnr Jul 23, 2024
e83eacd
move behavior out of shared fn
lcnr Jul 23, 2024
0c75c08
merge impl blocks
lcnr Jul 23, 2024
f860873
split provisional cache and stack lookup
lcnr Jul 23, 2024
1b6df71
Explicitly specify type parameter on FromResidual impls in stdlib.
zachs18 Aug 10, 2024
0aa17a4
implement a performant and fuzzed solver cache
lcnr Jul 24, 2024
850bcbd
Test showing previous behavior
compiler-errors Aug 13, 2024
5df13af
Use the right type when coercing fn items to pointers
compiler-errors Aug 12, 2024
8419c09
stabilize `asm_const`
folkertdev Aug 10, 2024
342b374
Port `run-make/sysroot-crates-are-unstable` to rmake
Zalathar Aug 14, 2024
8557b56
Add `|` to make the html doc of `Level` rendered correctly
Jaic1 Aug 14, 2024
196d256
Rollup merge of #128570 - folkertdev:stabilize-asm-const, r=Amanieu
jieyouxu Aug 14, 2024
59ad2ae
Rollup merge of #128828 - lcnr:search-graph-11, r=compiler-errors
jieyouxu Aug 14, 2024
049b3e5
Rollup merge of #128954 - zachs18:fromresidual-no-default, r=scottmcm
jieyouxu Aug 14, 2024
2200910
Rollup merge of #129059 - compiler-errors:subtyping-correct-type, r=lcnr
jieyouxu Aug 14, 2024
7472d1b
Rollup merge of #129071 - Zalathar:sysroot-unstable, r=jieyouxu
jieyouxu Aug 14, 2024
4d8c0b3
Rollup merge of #129088 - Jaic1:fix-doc, r=GuillaumeGomez
jieyouxu Aug 14, 2024
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
Prev Previous commit
Next Next commit
simplify match + move debug! call
lcnr committed Aug 12, 2024
commit e87157ba2a63edae640f294531d1b9f3e8d37a2e
7 changes: 3 additions & 4 deletions compiler/rustc_type_ir/src/search_graph/mod.rs
Original file line number Diff line number Diff line change
@@ -106,16 +106,14 @@ pub enum UsageKind {
impl UsageKind {
fn merge(self, other: Self) -> Self {
match (self, other) {
(UsageKind::Mixed, _) | (_, UsageKind::Mixed) => UsageKind::Mixed,
(UsageKind::Single(lhs), UsageKind::Single(rhs)) => {
if lhs == rhs {
UsageKind::Single(lhs)
} else {
UsageKind::Mixed
}
}
(UsageKind::Mixed, UsageKind::Mixed)
| (UsageKind::Mixed, UsageKind::Single(_))
| (UsageKind::Single(_), UsageKind::Mixed) => UsageKind::Mixed,
}
}
}
@@ -458,7 +456,7 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {
for _ in 0..D::FIXPOINT_STEP_LIMIT {
match self.fixpoint_step_in_task(cx, input, inspect, &mut prove_goal) {
StepResult::Done(final_entry, result) => return (final_entry, result),
StepResult::HasChanged => debug!("fixpoint changed provisional results"),
StepResult::HasChanged => {}
}
}

@@ -623,6 +621,7 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {
if D::reached_fixpoint(cx, usage_kind, input, stack_entry.provisional_result, result) {
StepResult::Done(stack_entry, result)
} else {
debug!(?result, "fixpoint changed provisional results");
let depth = self.stack.push(StackEntry {
has_been_used: None,
provisional_result: Some(result),