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

Rust 1.83.0 #1581

Closed
wants to merge 2 commits into from
Closed

Conversation

thomas-zahner
Copy link
Member

@thomas-zahner thomas-zahner commented Dec 10, 2024

Address clippy warnings / errors when using Rust 1.83

let base = base
.clone()
.or_else(|| Base::from_source(&input_content.source));
let base_fallback = Base::from_source(&input_content.source);
Copy link
Member Author

Choose a reason for hiding this comment

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

@mre This is the only change I'm unsure about. Not really happy with this. Creating the base_fallback even when we don't need it is quite ugly. But I couldn't get it to work with inlining it or moving it into the or_else closure, because of lifetime issues. Do you have another idea?

Copy link
Member

Choose a reason for hiding this comment

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

I agree. We can always disable the lint and add a comment.

@thomas-zahner
Copy link
Member Author

@mre One additional question - just stumbled upon the test test_exclude_example_domains which is excluded in CI explicitly and it fails consistently. Shouldn't we either fix this test or remove it? I can also create an issue for that.

I see that the test is older than the fixture file. So maybe the test started to fail because the fixture was changed without updating the test?

Copy link
Contributor

@trask trask left a comment

Choose a reason for hiding this comment

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

several of these changes were made in #1576 (hoping we can merge that one first 🤞)

@mre
Copy link
Member

mre commented Dec 10, 2024

@mre One additional question - just stumbled upon the test test_exclude_example_domains which is excluded in CI explicitly and it fails consistently. Shouldn't we either fix this test or remove it? I can also create an issue for that.

Yes, we can remove it. If the fixture is easy to be updated, we can also do that, but let's not sweat it. 😉

@mre
Copy link
Member

mre commented Dec 10, 2024

several of these changes were made in #1576 (hoping we can merge that one first 🤞)

Yes. We're currently blocked on one more review. From my side, it looks fine. @thomas-zahner, could you take a look and try it out on your end?

@thomas-zahner
Copy link
Member Author

@trask oh didn't know. Thanks for the info

@mre
Copy link
Member

mre commented Dec 18, 2024

@thomas-zahner, #1576 got merged, so I guess you can rebase on top of master. 😃

@thomas-zahner
Copy link
Member Author

There are no more meaningful changes in this PR, all changes and clippy suggestions were already applied in #1576

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.

3 participants