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

Update dependencies (nightly-2021-12-01) #787

Merged
merged 7 commits into from
Dec 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 64 additions & 108 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions jni-gen/systest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ build = "build.rs"

[build-dependencies]
jni-gen = { path = ".." }
error-chain = "0.12.0"
error-chain = "0.12"
env_logger = "0.9"
ureq = "2.1"
tempdir = "0.3.5"
tempdir = "0.3"

[dependencies]
error-chain = "0.12.0"
error-chain = "0.12"
jni = { version = "0.19", features = ["invocation"] }
8 changes: 4 additions & 4 deletions prusti-launch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ test = false
doctest = false

[dependencies]
walkdir = "2.0.0"
walkdir = "2.0"
serde = { version = "1.0", features = ["derive"] }
toml = "0.5.8"
ctrlc = "3.1.9"
toml = "0.5"
ctrlc = "3.1"

[target.'cfg(unix)'.dependencies]
nix = "0.23"

[dev-dependencies]
glob = "0.3.0"
glob = "0.3"
16 changes: 8 additions & 8 deletions prusti-tests/tests/verify/ui/counterexamples/bool.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ note: the error originates here
8 | | }
| |_^
note: counterexample for "b"
initial value: true
final value: true
initial value: true
final value: true
--> $DIR/bool.rs:6:10
|
6 | fn test1(b: bool) -> bool {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/bool.rs:6:22
|
6 | fn test1(b: bool) -> bool {
Expand All @@ -39,14 +39,14 @@ note: the error originates here
14 | | }
| |_^
note: counterexample for "b"
initial value: true
final value: true
initial value: true
final value: true
--> $DIR/bool.rs:12:10
|
12 | fn test2(b: bool) -> bool {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/bool.rs:12:22
|
12 | fn test2(b: bool) -> bool {
Expand All @@ -59,8 +59,8 @@ error: [Prusti: verification error] the asserted expression might not hold
| ^^^^^^^^^^
|
note: counterexample for "b"
initial value: false
final value: false
initial value: false
final value: false
--> $DIR/bool.rs:16:10
|
16 | fn test3(b: bool) {
Expand Down
6 changes: 3 additions & 3 deletions prusti-tests/tests/verify/ui/counterexamples/char.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ note: the error originates here
8 | | }
| |_^
note: counterexample for "x"
initial value: 'c' (0x63)
final value: 'c' (0x63)
initial value: 'c' (0x63)
final value: 'c' (0x63)
--> $DIR/char.rs:6:10
|
6 | fn test1(x: char) -> bool {
| ^
note: counterexample for result
final value: true
final value: true
--> $DIR/char.rs:6:22
|
6 | fn test1(x: char) -> bool {
Expand Down
44 changes: 22 additions & 22 deletions prusti-tests/tests/verify/ui/counterexamples/enums-1.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -16,63 +16,63 @@ note: the error originates here
28 | | }
| |_^
note: counterexample for "x"
initial value: OneOfFive::Five {
a: ?,
b: ?,
c: ?,
d: ?,
e: ?,
}
final value: OneOfFive::Five {
a: ?,
b: ?,
c: ?,
d: ?,
e: ?,
}
initial value: OneOfFive::Five {
a: ?,
b: ?,
c: ?,
d: ?,
e: ?,
}
final value: OneOfFive::Five {
a: ?,
b: ?,
c: ?,
d: ?,
e: ?,
}
--> $DIR/enums-1.rs:19:10
|
19 | fn test1(x: OneOfFive, y: SecondEnum) -> bool {
| ^
note: counterexample for "y"
initial value: SecondEnum::One
final value: SecondEnum::One
initial value: SecondEnum::One
final value: SecondEnum::One
--> $DIR/enums-1.rs:19:24
|
19 | fn test1(x: OneOfFive, y: SecondEnum) -> bool {
| ^
note: counterexample for "a"
final value: 4
final value: 4
--> $DIR/enums-1.rs:22:27
|
22 | OneOfFive::Five { a, b, c, d, e } => match y {
| ^
note: counterexample for "b"
final value: true
final value: true
--> $DIR/enums-1.rs:22:30
|
22 | OneOfFive::Five { a, b, c, d, e } => match y {
| ^
note: counterexample for "c"
final value: 4
final value: 4
--> $DIR/enums-1.rs:22:33
|
22 | OneOfFive::Five { a, b, c, d, e } => match y {
| ^
note: counterexample for "d"
final value: 0x4
final value: 0x4
--> $DIR/enums-1.rs:22:36
|
22 | OneOfFive::Five { a, b, c, d, e } => match y {
| ^
note: counterexample for "e"
final value: false
final value: false
--> $DIR/enums-1.rs:22:39
|
22 | OneOfFive::Five { a, b, c, d, e } => match y {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/enums-1.rs:19:42
|
19 | fn test1(x: OneOfFive, y: SecondEnum) -> bool {
Expand Down
18 changes: 9 additions & 9 deletions prusti-tests/tests/verify/ui/counterexamples/enums-2.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ note: the error originates here
18 | | }
| |_^
note: counterexample for "x"
initial value: Choose::Two(
?,
)
final value: Choose::Two(
?,
)
initial value: Choose::Two(
?,
)
final value: Choose::Two(
?,
)
--> $DIR/enums-2.rs:12:10
|
12 | fn test1(x: Choose) -> bool {
| ^
note: counterexample for "x"
final value: -3
final value: -3
--> $DIR/enums-2.rs:15:21
|
15 | Choose::Two(x) => x < -3 || x > -3,
| ^
note: counterexample for "b"
final value: false
final value: false
--> $DIR/enums-2.rs:16:23
|
16 | Choose::Three(b) => true,
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/enums-2.rs:12:24
|
12 | fn test1(x: Choose) -> bool {
Expand Down
16 changes: 8 additions & 8 deletions prusti-tests/tests/verify/ui/counterexamples/enums-3.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ note: the error originates here
14 | | }
| |_^
note: counterexample for "x"
initial value: Something::Third
final value: Something::Third
initial value: Something::Third
final value: Something::Third
--> $DIR/enums-3.rs:12:10
|
12 | fn test1(x: Something) -> bool {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/enums-3.rs:12:27
|
12 | fn test1(x: Something) -> bool {
Expand All @@ -39,21 +39,21 @@ note: the error originates here
19 | | }
| |_^
note: counterexample for "x"
initial value: Something::Second
final value: Something::Second
initial value: Something::Second
final value: Something::Second
--> $DIR/enums-3.rs:17:10
|
17 | fn test2(x: Something, y: Something) -> bool {
| ^
note: counterexample for "y"
initial value: Something::First
final value: Something::First
initial value: Something::First
final value: Something::First
--> $DIR/enums-3.rs:17:24
|
17 | fn test2(x: Something, y: Something) -> bool {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/enums-3.rs:17:41
|
17 | fn test2(x: Something, y: Something) -> bool {
Expand Down
48 changes: 24 additions & 24 deletions prusti-tests/tests/verify/ui/counterexamples/enums-4.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ note: the error originates here
30 | | }
| |_^
note: counterexample for "x"
initial value: SomeStruct {
a: SomeEnum::?,
b: SomeEnum::?,
}
final value: SomeStruct {
a: SomeEnum::One,
b: SomeEnum::Two,
}
initial value: SomeStruct {
a: SomeEnum::?,
b: SomeEnum::?,
}
final value: SomeStruct {
a: SomeEnum::One,
b: SomeEnum::Two,
}
--> $DIR/enums-4.rs:22:10
|
22 | fn test1(x: SomeStruct) -> bool {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/enums-4.rs:22:28
|
22 | fn test1(x: SomeStruct) -> bool {
Expand All @@ -52,14 +52,14 @@ note: the error originates here
38 | | }
| |_^
note: counterexample for "x"
initial value: ref(SomeEnum::One)
final value: ref(SomeEnum::One)
initial value: ref(SomeEnum::One)
final value: ref(SomeEnum::One)
--> $DIR/enums-4.rs:33:10
|
33 | fn test2(x: &SomeEnum) -> bool {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/enums-4.rs:33:27
|
33 | fn test2(x: &SomeEnum) -> bool {
Expand All @@ -83,38 +83,38 @@ note: the error originates here
53 | | }
| |_^
note: counterexample for "x"
initial value: OtherEnum::Two(
?,
?,
)
final value: OtherEnum::Two(
SomeEnum::?,
SomeEnum::?,
)
initial value: OtherEnum::Two(
?,
?,
)
final value: OtherEnum::Two(
SomeEnum::?,
SomeEnum::?,
)
--> $DIR/enums-4.rs:41:10
|
41 | fn test3(x: OtherEnum) -> bool {
| ^
note: counterexample for "y"
final value: SomeEnum::?
final value: SomeEnum::?
--> $DIR/enums-4.rs:43:24
|
43 | OtherEnum::One(y) => true,
| ^
note: counterexample for "a"
final value: SomeEnum::One
final value: SomeEnum::One
--> $DIR/enums-4.rs:44:24
|
44 | OtherEnum::Two(a, b) => match a {
| ^
note: counterexample for "b"
final value: SomeEnum::Two
final value: SomeEnum::Two
--> $DIR/enums-4.rs:44:27
|
44 | OtherEnum::Two(a, b) => match a {
| ^
note: counterexample for result
final value: false
final value: false
--> $DIR/enums-4.rs:41:27
|
41 | fn test3(x: OtherEnum) -> bool {
Expand Down
Loading