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

Add Cargo.lock to repository #805

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Add Cargo.lock to repository #805

merged 5 commits into from
Nov 29, 2023

Conversation

str4d
Copy link
Contributor

@str4d str4d commented Nov 22, 2023

This is based on "whatever lockfile happened to last work for str4d" (with some updates), but going forward will be the lockfile we use for testing our MSRV. See https://blog.rust-lang.org/2023/08/29/committing-lockfiles for rationale on this change.

The extra packages added to Cargo.lock in 3cd1bed are the ones needed when building/testing with --all-features after adding the plotters/ttf feature as a dependency of test-dev-graph, as resolved by cargo +1.60.

This PR also makes rust-version in subdirectories' Cargo.toml files consistent with the top-level rust-toolchain.toml, i.e. 1.60, and adds some generated/temporary files to .gitignore.

This is currently "whatever lockfile happened to last work for str4d",
but going forward will be the lockfile we use for testing our MSRV. See
https://blog.rust-lang.org/2023/08/29/committing-lockfiles for rationale
on this change.
Some dependency updates are ignored because they bump MSRV.
@daira daira added the A-dev-tooling Area: Developer tooling label Nov 23, 2023
@daira daira modified the milestones: 0.3.0, 0.3.1 Nov 23, 2023
…go.toml`.

It was already 1.60 in `rust-toolchain.toml` in the workspace root, but
that is not used when building in the subdirectories.

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
… files.

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
Copy link
Contributor

@ebfull ebfull left a comment

Choose a reason for hiding this comment

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

ACK, didn't check the hashes but I think that's fine.

@daira daira merged commit 7fd2ce2 into main Nov 29, 2023
40 of 42 checks passed
@daira daira deleted the check-in-lockfile branch November 29, 2023 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-dev-tooling Area: Developer tooling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants