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.

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

Update dependencies. #547

Closed
wants to merge 1 commit into from
Closed

Update dependencies. #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ash-window/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ workspace = ".."

[dependencies]
ash = { path = "../ash", version = "0.35", default-features = false }
raw-window-handle = "0.3"
raw-window-handle = "0.4.2"

[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
raw-window-metal = "0.1"
raw-window-metal = "0.2.0"
Comment on lines -18 to +21
Copy link
Collaborator

Choose a reason for hiding this comment

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

#505


[dev-dependencies]
winit = "0.19.4"
winit = "0.26.1"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This probably needs additional changes, no?

Copy link
Author

Choose a reason for hiding this comment

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

cargo check --workspace seemed to work

Copy link
Collaborator

Choose a reason for hiding this comment

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

--workspace only checks the crates (binaries, libraries) in the workspace (and it seems to be the default when the root Cargo.toml only defines the workspace but doesn't contain any crate of its own).

You should however also check the examples with --examples, or more generically --all-targets.

ash = { path = "../ash", version = "0.35", default-features = false, features = ["linked"] }

[[example]]
Expand Down
4 changes: 2 additions & 2 deletions examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ authors = ["maik klein <maikklein@googlemail.com>"]
edition = "2018"

[dependencies]
winit = "0.25.0"
image = "0.10.4"
winit = "0.26.1"
image = "0.23.14"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need these minimum patch versions? Otherwise just omit them entirely, this is just an example.

# The examples require the validation layers, which means the SDK or
# equivalent development packages should be present, so we can link
# directly and benefit from the infallible `Entry` constructor.
Expand Down
2 changes: 1 addition & 1 deletion examples/src/bin/texture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ fn main() {

let image = image::load_from_memory(include_bytes!("../../assets/rust.png"))
.unwrap()
.to_rgba();
.to_rgba8();
let image_dimensions = image.dimensions();
let image_data = image.into_raw();
let image_buffer_info = vk::BufferCreateInfo {
Expand Down
10 changes: 5 additions & 5 deletions generator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ authors = ["Maik Klein <maikklein@googlemail.com>"]
edition = "2018"

[dependencies]
bindgen = "0.58"
heck = "0.3"
bindgen = "0.59.2"
heck = "0.4.0"
itertools = "0.10"
nom = "6.0"
once_cell = "1.7"
once_cell = "1.9.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Again no need for patch versions.

Copy link
Author

Choose a reason for hiding this comment

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

that's a bug in cargo upgrade --skip-compatible

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd do these by hand :)

proc-macro2 = "1.0"
quote = "1.0"
regex = "1.4"
vk-parse = { version = "0.6", features = ["vkxml-convert"] }
regex = "1.5.4"
vk-parse = { version = "0.7.0", features = ["vkxml-convert"] }
vkxml = "0.3"

[dependencies.syn]
Expand Down
4 changes: 2 additions & 2 deletions generator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![recursion_limit = "256"]

use heck::{CamelCase, ShoutySnakeCase, SnakeCase};
use heck::{ToLowerCamelCase, ToShoutySnakeCase, ToSnakeCase};
Copy link
Collaborator

@MarijnS95 MarijnS95 Jan 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Can we use the cleaner As* wrappers in formatting places?

EDIT: We can't in the places of format_ident! which calls their own limited IdentFragment trait instead of Display::fmt :(

use itertools::Itertools;
use nom::{
alt, char,
Expand Down Expand Up @@ -1200,7 +1200,7 @@ pub fn generate_extension_commands<'a>(

let ident = format_ident!(
"{}Fn",
extension_name.to_camel_case().strip_prefix("Vk").unwrap()
extension_name.to_lower_camel_case().strip_prefix("Vk").unwrap()
Copy link
Collaborator

Choose a reason for hiding this comment

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

Lower... So this won't strip the uppercase Vk prefix if the whole thing is lowered or will it retain characters that were uppercase?

Please run the generator at least once to make sure output doesn't change or remains what we expect.

);
let fp = generate_function_pointers(ident.clone(), &commands, &aliases, fn_cache);

Expand Down