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

internal: vendor query-group-macro in rust-analyzer #19305

Merged

Conversation

davidbarsky
Copy link
Contributor

Dependency of #18964. This shouldn't land until we get a Salsa release out, which depends on fixing the powerpc build failures.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 6, 2025
@davidbarsky davidbarsky force-pushed the davidbarsky/vendor-query-group-macro branch from db9115a to f8be89f Compare March 6, 2025 22:46
@davidbarsky
Copy link
Contributor Author

I'll fix that unused warning tomorrow, but I feel like we should hold off on landing this until on Monday, at the easliest.

@davidbarsky
Copy link
Contributor Author

I realized (and fixed, locally) why we were getting a dead code warning: the crates/query-group-macro/tests/logger_db.rs was now being compiled as its own test rather than its own module. I assume this has to do with this crate being migrated from its own, standalone thing to being part of a larger Cargo workspace.

@davidbarsky davidbarsky force-pushed the davidbarsky/vendor-query-group-macro branch from baf3bb9 to e20d12a Compare March 7, 2025 18:22
@davidbarsky
Copy link
Contributor Author

Alright, flattened the match expression and fixed the dead code warning. I'd like to squash those 3 commits into one before landing this, however.

@davidbarsky davidbarsky force-pushed the davidbarsky/vendor-query-group-macro branch 2 times, most recently from 09f06f4 to ff75ff5 Compare March 7, 2025 18:50
@davidbarsky davidbarsky force-pushed the davidbarsky/vendor-query-group-macro branch 3 times, most recently from ffd90d0 to fbb037c Compare March 10, 2025 14:03
@davidbarsky davidbarsky force-pushed the davidbarsky/vendor-query-group-macro branch from fbb037c to 7a7ff47 Compare March 10, 2025 14:13
@Veykril Veykril enabled auto-merge March 10, 2025 14:15
@Veykril Veykril added this pull request to the merge queue Mar 10, 2025
Merged via the queue into rust-lang:master with commit 7368212 Mar 10, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants