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.69.0 + remove toolchain confusion #1935

Merged
merged 17 commits into from
May 2, 2023
Merged

Rust 1.69.0 + remove toolchain confusion #1935

merged 17 commits into from
May 2, 2023

Conversation

teh-cmc
Copy link
Member

@teh-cmc teh-cmc commented Apr 19, 2023

  • Don't use actions-rs/toolchain: it just adds confusion, we're overriding it via rust-toolchain when building (whether we're in a docker runner, or a vanilla macOS/Windows)!
  • Use rust 1.69.0

Newly surfaced issues:

Checks:

  • pip install ./rerun_py && just py-run-all
  • just py-run-all-web using CI wheel

PR Build Summary: https://build.rerun.io/pr/1935

@teh-cmc teh-cmc changed the title ci: Build with Rust 1.69.0 Rust 1.69.0 Apr 19, 2023
@teh-cmc teh-cmc changed the title Rust 1.69.0 Rust 1.69.0 + remove toolchain confusion Apr 19, 2023
@teh-cmc teh-cmc added enhancement New feature or request dependencies concerning crates, pip packages etc labels May 2, 2023
@teh-cmc teh-cmc marked this pull request as ready for review May 2, 2023 14:28
Cargo.toml Outdated Show resolved Hide resolved
@teh-cmc teh-cmc force-pushed the cmc/ci/rust_1_69 branch 2 times, most recently from cdc23b9 to de1b132 Compare May 2, 2023 15:29
@teh-cmc teh-cmc linked an issue May 2, 2023 that may be closed by this pull request
crates/re_string_interner/src/lib.rs Outdated Show resolved Hide resolved
@@ -101,7 +101,7 @@ serde = { version = "1", features = ["derive"] }
slotmap = { version = "1.0.6", features = ["serde"] }
smallvec = { workspace = true, features = ["serde"] }
thiserror.workspace = true
time = { workspace = true, default-features = false, features = ["formatting"] }
Copy link
Member

Choose a reason for hiding this comment

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

Is it an error to set fault-features = false both here and in the root Cargo.toml?

Copy link
Member Author

Choose a reason for hiding this comment

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

It depends on the context...

If you're within the workspace, then the root Cargo.toml "wins" and this effectively does nothing since time is considered to not have any default features.

But what happens when you import re_viewer directly in an external project: surely the root manifest doesn't take precedence then...? or does it??! I'll test this for #2024...

Copy link
Member Author

Choose a reason for hiding this comment

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

Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
@teh-cmc teh-cmc merged commit 5304f65 into main May 2, 2023
@teh-cmc teh-cmc deleted the cmc/ci/rust_1_69 branch May 2, 2023 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies concerning crates, pip packages etc enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants