Skip to content

Improve std-lib-regression script#1360

Merged
celinval merged 2 commits intomodel-checking:mainfrom
celinval:issue-1359-std-dup
Jul 12, 2022
Merged

Improve std-lib-regression script#1360
celinval merged 2 commits intomodel-checking:mainfrom
celinval:issue-1359-std-dup

Conversation

@celinval
Copy link
Copy Markdown
Contributor

Description of changes:

Add a dummy proof-harness to it and fix the issue with duplicated lang items that was triggered when trying to resolve the dependencies. The issues seemed to be related to the fact that kani crate was built with a different version of the std library.

For now, we explicitly add the kani crate as a dependency so it gets rebuilt with the fresh std.

Resolved issues:

Resolves #1359

Call-outs:

Testing:

  • How is this change tested? N/A

  • Is this a refactor change? N/A

Checklist

  • Each commit message has a non-empty body, explaining why the change was made
  • Methods or procedures are documented
  • Regression or unit tests are included, or existing tests cover the modified code
  • My PR is restricted to a single feature or bugfix

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

Add a dummy proof-harness to it and fix the issue with duplicated lang
items that was triggered when trying to resolve the dependencies. The
issues seemed to be related to the fact that `kani` crate was built with
a different version of the `std` library.

For now, we explicitly add the `kani` crate as a dependency so it gets
rebuilt with the fresh std.

# Until we add support to this via our bundle, rebuild the kani library too.
echo "
kani = {path=\"${KANI_DIR}/library/kani\"}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This might be a bit fragile since it depends on adding kani under the [dependencies] section. Perhaps in a future PR, we can rely on https://github.com/killercup/cargo-edit instead?

Copy link
Copy Markdown
Contributor Author

@celinval celinval Jul 12, 2022

Choose a reason for hiding this comment

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

I agree that this is rather fragile. TBH, I'm really hoping this script will be temporary. We need a better story for std distribution ASAP. Once we do have that, this script should go away and we will likely build (and distribute) the std.

@celinval celinval merged commit 5941fbb into model-checking:main Jul 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate lang item in crate std errors while building the std library

2 participants