Skip to content

Conversation

@adpaco-aws
Copy link
Contributor

@adpaco-aws adpaco-aws commented Nov 22, 2021

Description of changes:

Reverts the changes made in #523 when pub declarations were required for main functions (not anymore because of #656). The same change has been included in newer tests.

Resolved issues:

Resolves #659

Call-outs:

Testing:

2,6d1
< scripts/cargo-rmc
< scripts/rmc
< scripts/rmc.py
< src/test/cargo-rmc/simple-main/Cargo.toml
< src/test/cargo-rmc/simple-main/src/main.rs
10a6
> src/test/expected/closure/main.rs
11a8
> src/test/expected/closure3/main.rs
14c11,12
< src/test/expected/dry-run/expected
---
> src/test/expected/dry-run-flag-conflict-auto-unwind/main.rs
> src/test/expected/dry-run-flag-conflict/main.rs
27,28d24
< src/test/expected/replace-hashmap/main.rs
< src/test/expected/replace-vec/main.rs
53d48
< src/test/rmc/ArithOperators/main.rs
79a75,76
> src/test/rmc/BinOp_Offset/main.rs
> src/test/rmc/BinOp_Offset/main_fail.rs
90a88
> src/test/rmc/Cast/main.rs
147a146,148
> src/test/rmc/Enum/result1.rs
> src/test/rmc/Enum/result2.rs
> src/test/rmc/Enum/result3.rs
173a175,179
> src/test/rmc/ForeignItems/missing_fn_fail.rs
> src/test/rmc/FunctionAbstractions/mem_replace.rs
> src/test/rmc/FunctionAbstractions/mem_swap.rs
> src/test/rmc/FunctionAbstractions/ptr_read.rs
> src/test/rmc/FunctionAbstractions/ptr_write.rs
189a196,197
> src/test/rmc/Intrinsics/raw_eq.rs
> src/test/rmc/Iterator/try_fold.rs
195a204,205
> src/test/rmc/Never/main.rs
> src/test/rmc/Never/never_return.rs
222a233
> src/test/rmc/Slice/drop_in_place.rs
223a235
> src/test/rmc/Slice/pathbuf.rs
249a262
> src/test/rmc/VolatileIntrinsics/core_intrinsics.rs
253,255d265
< src/tools/compiletest/src/runtest.rs
< src/tools/dashboard/src/books.rs
< src/tools/dashboard/src/util.rs

Most files here are new (Never, FunctionAbstractions, etc.) or need not be changed (e.g., files in scripts or dashboard). In other cases, pub fn main was already there before #523

  • Is this a refactor change? No.

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.

@adpaco-aws adpaco-aws requested a review from a team as a code owner November 22, 2021 20:38
@adpaco-aws adpaco-aws merged commit eb0372c into model-checking:main Nov 22, 2021
@adpaco-aws adpaco-aws deleted the revert-tests branch November 22, 2021 22:19
tedinski pushed a commit to tedinski/rmc that referenced this pull request Apr 26, 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.

Revert changes in tests to have non-public main functions

2 participants