Support crate-type=bin and --tests with dependencies #1260
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
zhassan-aws
reviewed
Jun 8, 2022
There was a problem hiding this comment.
Looks great! Thanks for figuring this out, @tedinski!
Only have a few minor comments.
| @@ -11,6 +11,15 @@ pub fn alter_extension(path: &Path, ext: &str) -> PathBuf { | |||
| path.with_extension(ext) | |||
| } | |||
|
|
|||
| /// Attempt to guess the rlib name for rust source file | |||
| pub fn guess_rlib_name(path: &Path) -> PathBuf { | |||
There was a problem hiding this comment.
Is there a more reliable way to get the rlib name?
There was a problem hiding this comment.
Not as far as I can tell, will at least add a quick ref to rustc sources...
Co-authored-by: Zyad Hassan <88045115+zhassan-aws@users.noreply.github.com>
adpaco-aws
approved these changes
Jun 8, 2022
| let mut entries = Vec::new(); | ||
|
|
||
| for (entry_name, entry) in self.entries { | ||
| // FIXME only read the symbol table of the object files to avoid having to keep all |
There was a problem hiding this comment.
Do we want a tracking issue for the "FIXMEs" here?
There was a problem hiding this comment.
This is not our fixme, it's from the upstream file. I didn't remove it because I wanted to modify the file as minimally as possible.
zhassan-aws
approved these changes
Jun 8, 2022
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.
Description of changes:
This causes kani-compiler to emit
rlibfiles. Cargo expects these to exist in certain circumstances, such as for the dependencies of--crate-type=bin(including the binaries built by--tests)Resolved issues:
Resolves #1216
Resolves #473
Newly opened #1258
Call-outs:
archive.rsis basically just code lifted from cranelift, only slightly simplified to remove extra dependencies.Emitting
rlibmeanskani(single file mode) creates a new noisy file that we need to delete.THREE new major cargo-kani test cases!!
cfg(test)To use dev-dependencies, you need to guard withcfg(all(kani, test))#1258)tests/directory! (cargo kani --tests doesn't work with dependencies #1216 sort of, modulo To use dev-dependencies, you need to guard withcfg(all(kani, test))#1258)Testing:
How is this change tested? new tests
Is this a refactor change? no
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.