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

Remove unnecessary Option from ZalsaLocal::query_stack #624

Merged
merged 2 commits into from
Dec 13, 2024

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Dec 13, 2024

This removes a couple panic paths

Copy link

netlify bot commented Dec 13, 2024

Deploy Preview for salsa-rs canceled.

Name Link
🔨 Latest commit ac40e4c
🔍 Latest deploy log https://app.netlify.com/sites/salsa-rs/deploys/675c41a10c16530008166b7a

Copy link

codspeed-hq bot commented Dec 13, 2024

CodSpeed Performance Report

Merging #624 will not alter performance

Comparing Veykril:veykril/push-lrwklvvsooqp (ac40e4c) with master (f4ea167)

Summary

✅ 9 untouched benchmarks

aqs.iter_mut().for_each(|aq| {
cycle_query.add_from(aq);
v.push(aq.database_key_index);
let (me_recovered, others_recovered, cycle) = local_state.with_query_stack(|from_stack| {
Copy link
Member Author

Choose a reason for hiding this comment

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

The diff here is just the closure wrapping causing an extra level of indentation

thread_id,
database_key,
other_id,
mem::take(stack),
Copy link
Member Author

Choose a reason for hiding this comment

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

The mem::take is effectively what was Option::take before here

@Veykril Veykril force-pushed the veykril/push-lrwklvvsooqp branch 2 times, most recently from fc14245 to ef5c798 Compare December 13, 2024 11:19
@Veykril Veykril force-pushed the veykril/push-lrwklvvsooqp branch 2 times, most recently from ea69875 to 1925bf2 Compare December 13, 2024 12:52
@Veykril Veykril force-pushed the veykril/push-lrwklvvsooqp branch from 1925bf2 to ac40e4c Compare December 13, 2024 14:15
@Veykril Veykril added this pull request to the merge queue Dec 13, 2024
Merged via the queue into salsa-rs:master with commit 5cd2b63 Dec 13, 2024
10 checks passed
@Veykril Veykril deleted the veykril/push-lrwklvvsooqp branch December 13, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants