Skip to content

chore: update toolchain #309

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 68 commits into from
Oct 15, 2024
Merged

chore: update toolchain #309

merged 68 commits into from
Oct 15, 2024

Conversation

matthiasgoergens
Copy link
Contributor

@matthiasgoergens matthiasgoergens commented Oct 4, 2024

Our rust-toolchain specifies nightly-2024-05-02. That one comes with rustfmt version 1.7. But our rustfmt.toml uses style_edition = "2024"; but 2024 was only added in version 1.8. So in this PR we update to a more recent nightly toolchain.

Most of the changes in here are from our specified rustfmt.toml config actually applying. The main thing that's causing a lot of diff is version sorting of imports, which changes how letter case is handled for comparison.

Fixes #297

I extracted some clippy suggestions into #318 to make this PR smaller.

@matthiasgoergens matthiasgoergens marked this pull request as ready for review October 4, 2024 03:54
@matthiasgoergens matthiasgoergens changed the title WIP: try with latest stable toolchain WIP: try with latest nightly toolchain Oct 4, 2024
hero78119 pushed a commit that referenced this pull request Oct 4, 2024
I extracted these changes from
#309 to make that PR's diff
smaller and thus easier to review. The changes were suggested by the new
version of clippy.
@matthiasgoergens matthiasgoergens changed the title WIP: try with latest nightly toolchain chore: update toolchain Oct 7, 2024
At least those warnings that show up when running

```
cargo check --workspace --exclude ceno_rt --exclude singer-pro
```
Instead of whitelisting a few packages to run clippy on, we just
blacklist the two where it's not expected to work.
@matthiasgoergens matthiasgoergens force-pushed the matthias/toolchain-2024-10 branch from 0a54936 to 69c76b8 Compare October 15, 2024 02:54
Copy link
Contributor

@naure naure left a comment

Choose a reason for hiding this comment

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

See one question.

Also please announce or coordinate on Slack because that may cause lots of merge conflicts.

wrap_comments = false
comment_width = 300
imports_granularity = "Crate"
max_width = 100
newline_style = "Unix"
normalize_comments = true
reorder_imports = true
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is now the default anyway.

@matthiasgoergens matthiasgoergens enabled auto-merge (squash) October 15, 2024 11:33
@@ -122,15 +122,6 @@ impl<E: ExtensionField> Circuit<E> {
let mut input_paste_from_consts_in = Vec::new();
let mut max_in_wit_num_vars: Option<usize> = None;
for (ty, in_cell_ids) in in_cell_ids.iter() {
#[cfg(feature = "debug")]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@naure I removed this, because clippy complained that we don't actually have a debug feature, and when I moved to using #[cfg(debug_assertions)] instead, I noticed that the code here is actually broken and doesn't compile.

@matthiasgoergens matthiasgoergens merged commit 5f417fb into master Oct 15, 2024
6 checks passed
@matthiasgoergens matthiasgoergens deleted the matthias/toolchain-2024-10 branch October 15, 2024 11:44
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.

Mixing up toolchain versions?
2 participants