Skip to content

fix build-test after breaking nightly proc-macro change #2807

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

Merged
merged 1 commit into from
Apr 19, 2025

Conversation

syphar
Copy link
Member

@syphar syphar commented Apr 19, 2025

This fixes the build-test breaking on master.

Reason is rust-lang/rust#139671, fixed in dtolnay/proc-macro2#497, released in proc-macro2 1.0.95.

The thing I'm not 100% certain is: we added this test in #1800, and I don't know if the new proc-macro2 version also covers what we wanted to test here.

full extracted error from the CI logs
[stderr]  Documenting proc-macro2 v1.0.33 (/opt/rustwide/workdir)    
[stderr] error[E0412]: cannot find type `SourceFile` in crate `proc_macro`    
[stderr]    --> src/wrapper.rs:362:26    
[stderr]     |    
[stderr] 362 |     Compiler(proc_macro::SourceFile),    
[stderr]     |                          ^^^^^^^^^^ not found in `proc_macro`    
[stderr]     |    
[stderr] help: consider importing one of these structs    
[stderr]     |    
[stderr] 1   + use crate::SourceFile;    
[stderr]     |    
[stderr] 1   + use crate::fallback::SourceFile;    
[stderr]     |    
[stderr] help: if you import `SourceFile`, refer to it directly    
[stderr]     |    
[stderr] 362 -     Compiler(proc_macro::SourceFile),    
[stderr] 362 +     Compiler(SourceFile),    
[stderr]     |    
[stderr]     
[stderr] error[E0412]: cannot find type `SourceFile` in crate `proc_macro`    
[stderr]    --> src/wrapper.rs:368:32    
[stderr]     |    
[stderr] 368 |     fn nightly(sf: proc_macro::SourceFile) -> Self {    
[stderr]     |                                ^^^^^^^^^^ not found in `proc_macro`    
[stderr]     |    
[stderr] help: consider importing one of these structs    
[stderr]     |    
[stderr] 1   + use crate::SourceFile;    
[stderr]     |    
[stderr] 1   + use crate::fallback::SourceFile;    
[stderr]     |    
[stderr] help: if you import `SourceFile`, refer to it directly    
[stderr]     |    
[stderr] 368 -     fn nightly(sf: proc_macro::SourceFile) -> Self {    
[stderr] 368 +     fn nightly(sf: SourceFile) -> Self {    

@syphar syphar requested a review from a team as a code owner April 19, 2025 10:30
@github-actions github-actions bot added S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed labels Apr 19, 2025
@GuillaumeGomez
Copy link
Member

Thanks!

@GuillaumeGomez GuillaumeGomez merged commit e7a97fd into rust-lang:master Apr 19, 2025
11 checks passed
@GuillaumeGomez GuillaumeGomez deleted the fix-test branch April 19, 2025 12:16
@github-actions github-actions bot added S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it and removed S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed labels Apr 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-deploy This PR is ready to be merged, but is waiting for an admin to have time to deploy it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants