transpile: add --reorganize-definitions back
#1454
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
This partially reverts 2bd339d, but only the changes to `c2rust-transpile/src/lib.rs`. We can't move `c2rust-refactor/src/bin/c2rust-refactor.rs` back to `c2rust/src/bin/c2rust-refactor.rs` because that introduces a dependency on `c2rust-refactor` from `c2rust`, which we can't have. `c2rust-refactor` is nightly-pinned, but `c2rust` (and its dependent `c2rust-transpile`) work on stable. Otherwise, `cargo install c2rust` won't work anymore. By keeping the explicit dependency detached, `--reorganize-definitions` should work if the `c2rust-refactor` binary exists. Furthermore, with the explicit dependency, the wrong `librustc_driver-*.so` was dependended on, which broke `c2rust-refactor`'s dynamic dependencies. Without it, it works.
This should work for suggestions even if `c2rust-refactor` is not installed, which may be the case since `c2rust` doesn't (and can't) explicitly depend on `c2rust-refactor`.
…nd and don't use racy `.exists()` check
….rs` to `main.rs`
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.
This is split off from #1451, but doesn't enable
--reorganize-definitionsby default, so it shouldn't need the fixes in #1452 yet, of which the disabling caching of zero values needs to be fixed. Also, I'm not sure if we should enable--reorganize-definitionsby default, sincec2rust-refactorwon't be installed by default.