-
Notifications
You must be signed in to change notification settings - Fork 60
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
Improve cargo workspace #330
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
55d35fb
refactor(workspace): separate project into 3 folders
rkuklik 0f1fdfc
refactor(naming): rename utils to common
rkuklik a2252dc
fix(ci): `rust-version` detection and formatting
rkuklik b901f9b
fix(ci): nix build version extraction
rkuklik 18cee57
fix(script): update singe file on version change
rkuklik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
[package] | ||
name = "swww" | ||
version.workspace = true | ||
authors.workspace = true | ||
edition.workspace = true | ||
rust-version.workspace = true | ||
license-file.workspace = true | ||
|
||
[lints] | ||
workspace = true | ||
|
||
[dependencies] | ||
image = { version = "0.25", default-features = false, features = [ | ||
# all formats, except avif, since avif compiles just rav1d, which is just an | ||
# encoder, which we do not care about | ||
"bmp", | ||
"dds", | ||
"exr", | ||
"ff", | ||
"gif", | ||
"hdr", | ||
"ico", | ||
"jpeg", | ||
"png", | ||
"pnm", | ||
"qoi", | ||
"tga", | ||
"tiff", | ||
"webp", | ||
] } | ||
fast_image_resize = "4.0" | ||
clap = { version = "4.5", features = ["derive", "wrap_help", "env"] } | ||
fastrand = { version = "2.1", default-features = false, features = ["std"] } | ||
common = { workspace = true } | ||
|
||
[dev-dependencies] | ||
assert_cmd = "2.0" | ||
|
||
[build-dependencies] | ||
clap = { version = "4.5", features = ["derive", "env"] } | ||
clap_complete = "4.5" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,26 @@ | ||
[package] | ||
name = "swww-daemon" | ||
version = "0.9.5-masterV2" | ||
authors = ["Leonardo Gibrowski Faé <leonardo.fae44@gmail.com>"] | ||
edition = "2021" | ||
version.workspace = true | ||
authors.workspace = true | ||
edition.workspace = true | ||
rust-version.workspace = true | ||
license-file.workspace = true | ||
|
||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html | ||
[lints] | ||
workspace = true | ||
|
||
[dependencies] | ||
log = { version = "0.4", default_features = false, features = [ "max_level_debug", "release_max_level_info", "std" ] } | ||
log = { version = "0.4", default-features = false, features = [ | ||
"max_level_debug", | ||
"release_max_level_info", | ||
"std", | ||
] } | ||
|
||
rustix = { version = "0.38", default-features = false, features = [ "event" ] } | ||
rustix = { version = "0.38", default-features = false, features = ["event"] } | ||
libc = "0.2" | ||
|
||
keyframe = "1.1" | ||
|
||
sd-notify = { version = "0.4.1" } | ||
|
||
utils = { version = "0.9.5-masterV2", path = "../utils" } | ||
common = { workspace = true } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
use utils::ipc::PixelFormat; | ||
use common::ipc::PixelFormat; | ||
|
||
pub struct Cli { | ||
pub format: Option<PixelFormat>, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is unnecessary, since the 2021 edition already uses resolver 2.