ctest: Small adjustments to existing tests #4554
Merged
Conversation
This file contains hidden or 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
rustbot
added
ctest
3 tasks
|
Fyi @mbyx |
`let_chains` is a feature only available in edition 2024 and stabilized in 1.88, so this allows us to make use of them. Needed fixes include substituting `gen` to `gen_` since that is now a reserved keyword, and making `env::set_var` unsafe (this needs to be fixed). There are also automatic changes for format edition 2024 (e.g. import reordering). This needs a small CI hack where we temporarily remove the `ctest-next` crate from the workspace because old Cargo doesn't recognize "2024" as a valid edition.
When a type has restricted visiblity, `pub` acts the same as `pub(crate)`. Simplify to `pub` which is a bit cleaner.
Give a slightly better structure for our eyes to follow. Unfortunately we can't do anything for C files. This affects whitespace output in a way that isn't straightforward to resolve with `+`/`-`/`~` Askama directives, so also ensure that template output has a single trailing newline.
Currently nothing is added if a constant is a pointer but not a `c_char`. Resolve this by reducing to a single branch.
tgross35
force-pushed
the
ctest-tweaks
branch
4 times, most recently
from
0193cad to
364a35d
Compare
Apply the following changes: * Separate `id` (a valid identifier) from `rust_const` (potentially an invalid indentifier with `::`) since for the future we can't assume we will always have top-level items. Rename a few other fields to be consistent. * Change the `CStr` tests to be single-indirection, which is possible because we know the type. * Split up some `unsafe` blocks and add safety comments. * Rename test functions to start with `ctest_` rather than `__`. * Rename `TestCstr` to `TestCStr` (casing).
The types of templates are statically known, as is the error type. We can give this a strong typing rather than using strings.
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.
See each commit message for more details.