Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Update dependencies (rustc nightly-2022-05-01, viper v.22.04.17-release) #990

Closed
wants to merge 7 commits into from

Conversation

viper-admin
Copy link
Member

@viper-admin viper-admin commented May 1, 2022

  • Update Viper version to v.22.04.17-release.
  • Update rustc version to nightly-2022-05-01.
  • Manualy update outdated dependencies (see the list below).
  • Manualy run cargo update.
List of direct outdated dependencies:
$ cargo outdated --root-deps-only --workspace

info: syncing channel updates for 'nightly-2022-05-01-x86_64-unknown-linux-gnu'
info: latest update on 2022-05-01, rust version 1.62.0-nightly (7c4b47696 2022-04-30)
info: downloading component 'cargo'
info: downloading component 'llvm-tools-preview'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: downloading component 'rustc-dev'
info: downloading component 'rustfmt'
info: installing component 'cargo'
info: installing component 'llvm-tools-preview'
info: installing component 'rust-std'
info: installing component 'rustc'
info: installing component 'rustc-dev'
info: installing component 'rustfmt'
    Updating git repository `https://github.com/rust-lang/cargo.git`
analysis
================
Name        Project  Compat  Latest   Kind    Platform
----        -------  ------  ------   ----    --------
serde       1.0.136  ---     1.0.137  Normal  ---
serde_json  1.0.79   ---     1.0.80   Normal  ---
syn         1.0.91   ---     1.0.92   Normal  ---

prusti-common
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
serde  1.0.136  ---     1.0.137  Normal  ---
uuid   0.8.2    ---     1.0.0    Normal  ---

viper
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
serde  1.0.136  ---     1.0.137  Normal  ---
uuid   0.8.2    ---     1.0.0    Normal  ---

vir
================
Name       Project  Compat  Latest   Kind    Platform
----       -------  ------  ------   ----    --------
serde      1.0.136  ---     1.0.137  Normal  ---
syn        1.0.91   ---     1.0.92   Normal  ---
thiserror  1.0.30   ---     1.0.31   Normal  ---
uuid       0.8.2    ---     1.0.0    Normal  ---

vir-gen
================
Name  Project  Compat  Latest  Kind    Platform
----  -------  ------  ------  ----    --------
syn   1.0.91   ---     1.0.92  Normal  ---

prusti-contracts
================
Name      Project  Compat  Latest  Kind         Platform
----      -------  ------  ------  ----         --------
trybuild  1.0.59   ---     1.0.61  Development  ---

prusti-specs
================
Name        Project  Compat  Latest   Kind    Platform
----        -------  ------  ------   ----    --------
serde       1.0.136  ---     1.0.137  Normal  ---
serde_json  1.0.79   ---     1.0.80   Normal  ---
syn         1.0.91   ---     1.0.92   Normal  ---
uuid        0.8.2    ---     1.0.0    Normal  ---

prusti-interface
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
serde  1.0.136  ---     1.0.137  Normal  ---

prusti-viper
================
Name       Project  Compat  Latest   Kind    Platform
----       -------  ------  ------   ----    --------
backtrace  0.3.64   ---     0.3.65   Normal  ---
serde      1.0.136  ---     1.0.137  Normal  ---

prusti-server
================
Name     Project  Compat  Latest   Kind    Platform
----     -------  ------  ------   ----    --------
clap     3.1.8    ---     3.1.14   Normal  ---
reqwest  0.10.10  ---     0.11.10  Normal  ---
serde    1.0.136  ---     1.0.137  Normal  ---
tokio    0.2.25   ---     1.18.0   Normal  ---
warp     0.2.5    ---     0.3.2    Normal  ---

prusti-launch
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
ctrlc  3.2.1    ---     3.2.2    Normal  ---
nix    0.23.1   ---     0.24.1   Normal  cfg(unix)
serde  1.0.136  ---     1.0.137  Normal  ---

test-crates
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
clap   3.1.8    ---     3.1.14   Normal  ---
serde  1.0.136  ---     1.0.137  Normal  ---

@JonasAlaif could you take care of this?

@JonasAlaif
Copy link
Contributor

Still fails to compile at this line:

let _opaque_types = infcx.inner.borrow_mut().opaque_type_storage.take_opaque_types();

Commenting it out makes things work, but I'm not sure that's the correct solution

@JonasAlaif
Copy link
Contributor

Also unclear why the CI doesn't use the same compiler version as the one that succesfully compiles locally for me? From the docs of the latest docs it seems that the CI version is outdated

@fpoli
Copy link
Member

fpoli commented May 13, 2022

I believe the upgrade of hyper is still blocked by rust-lang/rust#82151 and hyperium/hyper#2685. We should open an issue in our tracker and label it with pending-on-external to remember it.

@fpoli
Copy link
Member

fpoli commented May 13, 2022

Also unclear why the CI doesn't use the same compiler version as the one that succesfully compiles locally for me? From the docs of the latest docs it seems that the CI version is outdated

Isn't it the other way around? CI complains that the code uses a non-existing .variants field and suggests to use the variants() method. The nightly version of the compiler indeed has the method but not the field, while the older stable version that you linked still has the variants field.

@fpoli
Copy link
Member

fpoli commented May 13, 2022

Be aware that the Viper update brings the modifications to the position of some verification errors (viperproject/silver#560). So, Prusti should register verification errors on the expression of assert/exhale statement instead of registering the statement itself.

@JonasAlaif
Copy link
Contributor

JonasAlaif commented May 13, 2022

Also unclear why the CI doesn't use the same compiler version as the one that succesfully compiles locally for me? From the docs of the latest docs it seems that the CI version is outdated

Isn't it the other way around? CI complains that the code uses a non-existing .variants field and suggests to use the variants() method. The nightly version of the compiler indeed has the method but not the field, while the older stable version that you linked still has the variants field.

Cry... somehow when I was doing x.py build on my windows it doesn't pick up the rust-toolchain. I've essentially reverted the changes from the past few months (if we want a version of Prusti that works with stable ¯\_(ツ)_/¯).
I'll hard reset and try again now

@JonasAlaif JonasAlaif force-pushed the auto-update-nightly-2022-05-01 branch from 8f07f74 to 9e363b3 Compare May 13, 2022 11:46
@JonasAlaif JonasAlaif force-pushed the auto-update-nightly-2022-05-01 branch from a3239c7 to bad0950 Compare May 13, 2022 13:31
@JonasAlaif
Copy link
Contributor

I believe the upgrade of hyper is still blocked by rust-lang/rust#82151 and hyperium/hyper#2685. We should open an issue in our tracker and label it with pending-on-external to remember it.

What was the issue when you initially tried it? I've set tokio, etc. to the latest version and things seem to compile just fine locally - running the CI now to see if there are any issues there. Is it an issue that the CI wouldn't pick up?

viper/src/verifier.rs Outdated Show resolved Hide resolved
@JonasAlaif
Copy link
Contributor

@fpoli I've updated the version of warp/reqwest/tokio and things seem to work fine, are we ok to merge with the newest version?

@fpoli
Copy link
Member

fpoli commented May 16, 2022

@fpoli I've updated the version of warp/reqwest/tokio and things seem to work fine, are we ok to merge with the newest version?

Nice! Sure

Copy link
Contributor

@vakaras vakaras left a comment

Choose a reason for hiding this comment

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

LGTM. Is there anything else to do or can this be bors r+?

@JonasAlaif
Copy link
Contributor

bors r+

bors bot pushed a commit that referenced this pull request May 17, 2022
…se) (#990)

* [x] Update Viper version to `v.22.04.17-release`.
* [x] Update rustc version to `nightly-2022-05-01`.
* [x] Manualy update outdated dependencies (see the list below).
* [x] Manualy run `cargo update`.

<details><summary>List of direct outdated dependencies:</summary>

```
$ cargo outdated --root-deps-only --workspace

info: syncing channel updates for 'nightly-2022-05-01-x86_64-unknown-linux-gnu'
info: latest update on 2022-05-01, rust version 1.62.0-nightly (7c4b47696 2022-04-30)
info: downloading component 'cargo'
info: downloading component 'llvm-tools-preview'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: downloading component 'rustc-dev'
info: downloading component 'rustfmt'
info: installing component 'cargo'
info: installing component 'llvm-tools-preview'
info: installing component 'rust-std'
info: installing component 'rustc'
info: installing component 'rustc-dev'
info: installing component 'rustfmt'
    Updating git repository `https://github.com/rust-lang/cargo.git`
analysis
================
Name        Project  Compat  Latest   Kind    Platform
----        -------  ------  ------   ----    --------
serde       1.0.136  ---     1.0.137  Normal  ---
serde_json  1.0.79   ---     1.0.80   Normal  ---
syn         1.0.91   ---     1.0.92   Normal  ---

prusti-common
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
serde  1.0.136  ---     1.0.137  Normal  ---
uuid   0.8.2    ---     1.0.0    Normal  ---

viper
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
serde  1.0.136  ---     1.0.137  Normal  ---
uuid   0.8.2    ---     1.0.0    Normal  ---

vir
================
Name       Project  Compat  Latest   Kind    Platform
----       -------  ------  ------   ----    --------
serde      1.0.136  ---     1.0.137  Normal  ---
syn        1.0.91   ---     1.0.92   Normal  ---
thiserror  1.0.30   ---     1.0.31   Normal  ---
uuid       0.8.2    ---     1.0.0    Normal  ---

vir-gen
================
Name  Project  Compat  Latest  Kind    Platform
----  -------  ------  ------  ----    --------
syn   1.0.91   ---     1.0.92  Normal  ---

prusti-contracts
================
Name      Project  Compat  Latest  Kind         Platform
----      -------  ------  ------  ----         --------
trybuild  1.0.59   ---     1.0.61  Development  ---

prusti-specs
================
Name        Project  Compat  Latest   Kind    Platform
----        -------  ------  ------   ----    --------
serde       1.0.136  ---     1.0.137  Normal  ---
serde_json  1.0.79   ---     1.0.80   Normal  ---
syn         1.0.91   ---     1.0.92   Normal  ---
uuid        0.8.2    ---     1.0.0    Normal  ---

prusti-interface
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
serde  1.0.136  ---     1.0.137  Normal  ---

prusti-viper
================
Name       Project  Compat  Latest   Kind    Platform
----       -------  ------  ------   ----    --------
backtrace  0.3.64   ---     0.3.65   Normal  ---
serde      1.0.136  ---     1.0.137  Normal  ---

prusti-server
================
Name     Project  Compat  Latest   Kind    Platform
----     -------  ------  ------   ----    --------
clap     3.1.8    ---     3.1.14   Normal  ---
reqwest  0.10.10  ---     0.11.10  Normal  ---
serde    1.0.136  ---     1.0.137  Normal  ---
tokio    0.2.25   ---     1.18.0   Normal  ---
warp     0.2.5    ---     0.3.2    Normal  ---

prusti-launch
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
ctrlc  3.2.1    ---     3.2.2    Normal  ---
nix    0.23.1   ---     0.24.1   Normal  cfg(unix)
serde  1.0.136  ---     1.0.137  Normal  ---

test-crates
================
Name   Project  Compat  Latest   Kind    Platform
----   -------  ------  ------   ----    --------
clap   3.1.8    ---     3.1.14   Normal  ---
serde  1.0.136  ---     1.0.137  Normal  ---
```
</details>

@JonasAlaif could you take care of this?

Co-authored-by: Jonas <jonas.fiala.cardiff@gmail.com>
@bors
Copy link
Contributor

bors bot commented May 17, 2022

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title Update dependencies (rustc nightly-2022-05-01, viper v.22.04.17-release) [Merged by Bors] - Update dependencies (rustc nightly-2022-05-01, viper v.22.04.17-release) May 17, 2022
@bors bors bot closed this May 17, 2022
@JonasAlaif JonasAlaif deleted the auto-update-nightly-2022-05-01 branch August 2, 2022 15:43
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.

4 participants