Skip to content

rust: move config files to src/rust #522

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jun 29, 2020
Merged

rust: move config files to src/rust #522

merged 2 commits into from
Jun 29, 2020

Conversation

benma
Copy link
Collaborator

@benma benma commented Jun 28, 2020

It was in the root before because .cargo/config would not be resolved:

rust-lang/cargo#2930

Changing the working directory fixes it.

Putting those files to src/rust is good to keep it close to the rust
code.

This also allows to add another Rust project in e.g. /tools, with a
different config.

@benma
rust: move config files to src/rust
4bdfdd2 
It was in the root before because .cargo/config would not be resolved:

rust-lang/cargo#2930

Changing the working directory fixes it.

Putting those files to src/rust is good to keep it close to the rust
code.

This also allows to add another Rust project in e.g. /tools, with a
different config.
@benma benma requested a review from x1ddos June 28, 2020 19:42
@x1ddos
Copy link
Contributor

x1ddos commented Jun 29, 2020

I also get these warnings. Would it make sense to move profiles to the workspace root in this PR?

warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   src/rust/bitbox02-rust-c/Cargo.toml
workspace: src/rust/Cargo.toml
warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   src/rust/bitbox02/Cargo.toml
workspace: src/rust/Cargo.toml
warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   src/rust/bitbox02-sys/Cargo.toml
workspace: src/rust/Cargo.toml

@benma
rust: remove profile sections from subproject Cargo.toml files
1058353 
Only the ones in the workspace Cargo.toml are are considered.
@benma
Copy link
Collaborator Author

benma commented Jun 29, 2020

I also get these warnings. Would it make sense to move profiles to the workspace root in this PR?

warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   src/rust/bitbox02-rust-c/Cargo.toml
workspace: src/rust/Cargo.toml
warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   src/rust/bitbox02/Cargo.toml
workspace: src/rust/Cargo.toml
warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   src/rust/bitbox02-sys/Cargo.toml
workspace: src/rust/Cargo.toml

good catch, done. GH CI failed cause GH is dying today.

x1ddos
x1ddos approved these changes Jun 29, 2020
View reviewed changes
Copy link
Contributor

@x1ddos x1ddos left a comment

Choose a reason for hiding this comment

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

LGTM

@benma benma merged commit 3200e17 into BitBoxSwiss:master Jun 29, 2020
@benma benma mentioned this pull request Jul 2, 2020
Merged
@benma benma deleted the rust-config branch July 2, 2020 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@x1ddos x1ddos x1ddos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@benma @x1ddos