Preliminary cleanup pass #339
Merged
Conversation
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
MarijnS95
commented
Nov 23, 2020
{let $p = $f; match $q { vk::Result::SUCCESS => Ok($r), _ => Err($z), }} ==>> {$f.result_with_success($r)}
Using the following regex replacement:
let err_code =\s*(.*\((\n|[^;])*?\));\s*match err_code \{\s*vk::Result::SUCCESS => Ok\((.*)\),\s*_ => Err\(err_code\),\s*\}
$1.result_with_success($3)
let err_code =\s*(.*\((\n|[^;])*?\));\s*if err_code != vk::Result::SUCCESS \{\s*return Err\(err_code\);\s*\}
$1.result()?;
ANativeWindow and AHardwareBuffer were [recently changed] to the basetype category, but without an actual basetype, consequently failing the Ident constructor with an empty name. Since these types are already dealt with in platform_types, and there doesn't seem to be anything sensical to define them to right now, just ignore these cases. [recently changed]: KhronosGroup/Vulkan-Headers@0c5351f#diff-0ff049f722e55de41ee15b2c91ef380fL179-R180
|
Sorry for being a bit unresponsive, I am a bit swamped right now. The result changes look great 💯, I'll have a look at the rest in a few days. |
|
@MaikKlein No worries, there's no hurry in merging this as the official RT spec is still in the process of being dropped. It's actually convenient so that I could sneak in some extra fixes, but do let me know if this gets too large, which it already is to some extent! Glad you like it though! |
The reference argument was always None; replace it with a direct call to name_to_tokens.
38 tasks
MaikKlein
approved these changes
Dec 12, 2020
|
Thanks @MaikKlein for reviewing this rather large chunk of changes, glad you like it :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hi Maik,
Apologies for this massive PR. It's some upfront cleanup work that came up while working on
ash, in particular aroundResulttypes and error handling.I can only recommend to review the changes per commit to get around the bulk of it easily. While this aims to make the code ever so slightly better it results in lots of noise, let me know if any commit (hash) is not worth taking in and I'll gladly remove it again.
To highlight the changes:
#[must_use]onvk::Result;vk::ResulttoResult<T, vk::Result>;TokenStreamand replacing identifiers with their Rust counterpart. This is going to be more relevant in the future;Thanks!