Skip to content

ron: support upstream changes #10649

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 5 commits into from
Jul 6, 2023

Conversation

manunio
Copy link
Contributor

@manunio manunio commented Jul 5, 2023

cc @juntyr

@github-actions
Copy link

github-actions bot commented Jul 5, 2023

manunio has previously contributed to projects/ron. The previous PR was #8676

@juntyr
Copy link

juntyr commented Jul 5, 2023

@manunio I thought I had fixed the unknown feature bug already by removing the Cargo.lock file from the fuzzer, which had pinned an old version of proc-macro2.

@manunio
Copy link
Contributor Author

manunio commented Jul 5, 2023

@manunio I thought I had fixed the unknown feature bug already by removing the Cargo.lock file from the fuzzer, which had pinned an old version of proc-macro2.

Hi, I'm not sure why but it was still failing at my local machine even after applying your fix. Let me check that against ci.

@manunio manunio marked this pull request as draft July 5, 2023 17:16
@manunio
Copy link
Contributor Author

manunio commented Jul 5, 2023

@juntyr checked it against ci its failing.

 error[E0635]: unknown feature `proc_macro_span_shrink`
  --> /rust/registry/src/index.crates.io-6f17d22bba15001f/proc-macro2-1.0.56/src/lib.rs:92:30
   |
92 |     feature(proc_macro_span, proc_macro_span_shrink)
   |                              ^^^^^^^^^^^^^^^^^^^^^^

@juntyr
Copy link

juntyr commented Jul 5, 2023

@juntyr checked it against ci its failing.

 error[E0635]: unknown feature `proc_macro_span_shrink`
  --> /rust/registry/src/index.crates.io-6f17d22bba15001f/proc-macro2-1.0.56/src/lib.rs:92:30
   |
92 |     feature(proc_macro_span, proc_macro_span_shrink)
   |                              ^^^^^^^^^^^^^^^^^^^^^^

Oh dang that’s my fault, sorry. The PR branch wasn’t rebased yet - let me fix that quickly

@juntyr
Copy link

juntyr commented Jul 5, 2023

Ok, let’s see if CI works now. If it does, I’ll merge the PR into ron and we can change this PR to just point at the ron head again.

@manunio
Copy link
Contributor Author

manunio commented Jul 6, 2023

Ok, let’s see if CI works now. If it does, I’ll merge the PR into ron and we can change this PR to just point at the ron head again.

@juntyr ci is passing now.

@manunio manunio marked this pull request as ready for review July 6, 2023 15:43
@juntyr
Copy link

juntyr commented Jul 6, 2023

Ok, let’s see if CI works now. If it does, I’ll merge the PR into ron and we can change this PR to just point at the ron head again.

@juntyr ci is passing now.

Thank you so much for your help! I've merged the PR into ron.

Copy link
Contributor

@jonathanmetzman jonathanmetzman left a comment

Choose a reason for hiding this comment

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

lgtm

@jonathanmetzman jonathanmetzman merged commit 092f4d5 into google:master Jul 6, 2023
@manunio manunio deleted the ron-support-multiple-fuzzers branch September 13, 2023 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants