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.

Sign up for GitHub

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

BUG fuzzing found a bug in the resolver, we need a complete set of conflicts to do backjumping #5988

Merged
merged 22 commits into from
Sep 17, 2018
Merged

BUG fuzzing found a bug in the resolver, we need a complete set of conflicts to do backjumping #5988

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
dfad631
Copy the full case from https://github.com/rust-lang/cargo/commit/003…
Eh2406 Sep 6, 2018
0781ce2
remove things depending on bad, rename some things
Eh2406 Sep 6, 2018
4cfe649
remove "D"
Eh2406 Sep 6, 2018
77cd4d7
remove lots more
Eh2406 Sep 6, 2018
ad852eb
rename things
Eh2406 Sep 6, 2018
d6d3a04
renumber things
Eh2406 Sep 6, 2018
e6078b4
split up some names
Eh2406 Sep 6, 2018
a875816
time to investigate the bug
Eh2406 Sep 6, 2018
69e00e8
this oddly worked
Eh2406 Sep 12, 2018
b0ab1f2
a new one to minimized
Eh2406 Sep 12, 2018
00cbb0a
remove unused crates
Eh2406 Sep 12, 2018
47d9fe9
remove debs leading to remove now unused crates
Eh2406 Sep 13, 2018
70bfd73
remove debs leading to remove now unused crates
Eh2406 Sep 14, 2018
c77f60d
rename deps
Eh2406 Sep 14, 2018
2f21280
clean up commas
Eh2406 Sep 14, 2018
9051dbf
a new one to minimized
Eh2406 Sep 14, 2018
fbee2e7
remove debs leading to remove now unused crates
Eh2406 Sep 14, 2018
079ac47
rename deps
Eh2406 Sep 14, 2018
8707fcb
small clean up
Eh2406 Sep 14, 2018
2b1f093
only skip in the `backtrack_stack` if the `conflicting_activations` i…
Eh2406 Sep 14, 2018
9b2295d
cargo fmt
Eh2406 Sep 14, 2018
682b295
bump env_logger to a more minimal-versions compatible one
Eh2406 Sep 17, 2018
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
Prev Previous commit
Next Next commit
remove "D"
  • Loading branch information
@Eh2406
Eh2406 committed Sep 6, 2018
commit 4cfe649e00a5822b9beee197b6e2b2eb51699ea3
36 changes: 10 additions & 26 deletions tests/testsuite/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,27 +983,23 @@ fn dont_yet_know_the_problem() {
pkg!(("C", "0.0.0") => [
dep_req("A", ">=1.4.5,<=5.5.2"),
dep_req("B", ">=1.4.3,<=2.1.0")]),
pkg!(("D", "1.1.5") => [
dep_req("C", "=0.0.0")]),
pkg!(("E", "0.0.4") => [
dep_req("A", ">=3.2.3,<=5.1.1"),
dep_req("B", ">=1.4.3,<=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5")]),
dep_req("C", "=0.0.0")]),
pkg!(("E", "3.5.2") => [
dep_req("B", "=4.0.1"),
dep_req("C", "=0.0.0")]),
pkg!(("E", "4.1.3") => [
dep_req("A", "=3.2.3"),
dep_req("B", ">=1.4.3,<=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5")]),
dep_req("C", "=0.0.0")]),
pkg!(("F", "0.5.5") => [
dep_req("B", "=2.1.0"),
dep_req("C", "=0.0.0")]),
pkg!(("F", "2.3.2") => [
dep_req("B", ">=1.4.3,<=2.1.0"),
dep_req("D", "=1.1.5")]),
dep_req("C", "=0.0.0")]),
pkg!(("I-_eFdfZc___Aw-_W-VNtF", "1.3.1") => [
dep_req("B", "=2.1.0"),
dep_req("C", "=0.0.0"),
Expand All @@ -1014,74 +1010,66 @@ fn dont_yet_know_the_problem() {
dep_req("A", ">=1.4.5,<=5.5.2"),
dep_req("B", ">=1.4.3,<=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=0.0.4,<=3.5.2")]),
pkg!(("I-_eFdfZc___Aw-_W-VNtF", "4.3.0")),
pkg!(("I-_eFdfZc___Aw-_W-VNtF", "5.2.1") => [
dep_req("A", ">=1.4.5,<=3.2.3"),
dep_req("B", "=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=0.0.4,<=4.1.3"),
dep_req("F", "=0.5.5")]),
pkg!(("X1cpwzRgr3-f_Z--z", "0.0.0") => [
dep_req("A", ">=1.4.5,<=5.1.1"),
dep_req("B", ">=1.4.3,<=4.0.1"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=0.0.4,<=4.1.3"),
dep_req("F", "=0.5.5"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", "=4.3.0")]),
pkg!(("X1cpwzRgr3-f_Z--z", "1.3.1") => [
dep_req("A", ">=1.4.5,<=2.2.3"),
dep_req("B", "=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=3.5.2,<=4.1.3"),
dep_req("F", ">=0.5.5,<=2.3.2"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", ">=3.5.4,<=5.2.1")]),
pkg!(("X1cpwzRgr3-f_Z--z", "1.3.2") => [
dep_req("A", "=3.2.3"),
dep_req("B", ">=2.1.0,<=4.0.1"),
dep_req("D", "=1.1.5"),
dep_req("C", "=0.0.0"),
dep_req("F", ">=0.5.5,<=2.3.2"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", "=3.5.4")]),
pkg!(("X1cpwzRgr3-f_Z--z", "2.0.5") => [
dep_req("A", ">=2.2.3,<=5.1.1"),
dep_req("B", ">=1.4.3,<=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=0.0.4,<=3.5.2"),
dep_req("F", "=2.3.2"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", ">=1.3.1,<=4.3.0")]),
pkg!(("X1cpwzRgr3-f_Z--z", "4.1.3") => [
dep_req("A", "=1.4.5"),
dep_req("B", ">=4.0.1,<=5.1.3"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=3.5.2,<=4.1.3"),
dep_req("F", ">=0.5.5,<=2.3.2"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", ">=4.3.0,<=5.2.1")]),
pkg!(("Z3-LN_81Tn3-", "0.0.0") => [
dep_req("A", ">=3.2.3,<=5.5.2"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=3.5.2,<=4.1.3"),
dep_req("F", "=2.3.2"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", ">=1.3.1,<=4.0.4")]),
pkg!(("Z3-LN_81Tn3-", "1.1.2") => [
dep_req("X1cpwzRgr3-f_Z--z", ">=1.3.2,<=2.0.5")]),
pkg!(("Z3-LN_81Tn3-", "1.4.2") => [
dep_req("A", ">=5.1.1,<=5.5.2"),
dep_req("D", "=1.1.5"),
dep_req("C", "=0.0.0"),
dep_req("E", ">=0.0.4,<=3.5.2"),
dep_req("F", ">=0.5.5,<=2.3.2"),
dep_req("X1cpwzRgr3-f_Z--z", ">=0.0.0,<=1.3.2")]),
pkg!(("Z3-LN_81Tn3-", "2.2.2") => [
dep_req("A", ">=3.2.3,<=5.5.2"),
dep_req("B", "=4.0.1"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", "=3.5.2"),
dep_req("F", "=0.5.5"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", "=1.3.1"),
Expand All @@ -1092,12 +1080,11 @@ fn dont_yet_know_the_problem() {
pkg!(("_5r1___Wiao4pU", "2.4.3") => [
dep_req("A", ">=1.4.5,<=5.5.2"),
dep_req("B", "=4.0.1"),
dep_req("D", "=1.1.5")]),
dep_req("C", "=0.0.0")]),
pkg!(("_5r1___Wiao4pU", "2.5.2") => [
dep_req("A", ">=1.4.5,<=5.5.2"),
dep_req("B", ">=4.0.1,<=5.1.3"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=0.0.4,<=4.1.3"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", ">=1.3.1,<=3.5.4"),
dep_req("X1cpwzRgr3-f_Z--z", ">=1.3.1,<=2.0.5")]),
Expand All @@ -1106,7 +1093,7 @@ fn dont_yet_know_the_problem() {
pkg!(("_7GYt6", "2.5.4") => [
dep_req("A", ">=2.2.3,<=3.2.3"),
dep_req("B", ">=1.4.3,<=5.1.3"),
dep_req("D", "=1.1.5"),
dep_req("C", "=0.0.0"),
dep_req("E", "=0.0.4"),
dep_req("F", "=0.5.5"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", "=4.0.4"),
Expand All @@ -1115,13 +1102,12 @@ fn dont_yet_know_the_problem() {
dep_req("A", "=2.2.3"),
dep_req("B", ">=1.4.3,<=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("C", "=0.0.0"),
dep_req("E", ">=0.0.4,<=3.5.2")]),
pkg!(("_7GYt6", "3.4.4") => [
dep_req("A", ">=2.2.3,<=5.1.1"),
dep_req("B", ">=4.0.1,<=5.1.3"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=0.0.4,<=4.1.3"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", ">=4.0.4,<=5.2.1"),
dep_req("X1cpwzRgr3-f_Z--z", ">=0.0.0,<=1.3.1"),
Expand All @@ -1132,7 +1118,7 @@ fn dont_yet_know_the_problem() {
dep_req("E", ">=3.5.2,<=4.1.3"),
dep_req("X1cpwzRgr3-f_Z--z", "=0.0.0")]),
pkg!(("b_SvYO8", "3.3.3") => [
dep_req("D", "=1.1.5"),
dep_req("C", "=0.0.0"),
dep_req("Z3-LN_81Tn3-", ">=1.4.2,<=4.3.4")]),
pkg!(("b_SvYO8", "3.3.4") => [
dep_req("E", ">=0.0.4,<=3.5.2")]),
Expand All @@ -1152,7 +1138,6 @@ fn dont_yet_know_the_problem() {
dep_req("A", "=3.2.3"),
dep_req("B", ">=1.4.3,<=2.1.0"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", ">=3.5.2,<=4.1.3"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", ">=4.3.0,<=5.2.1"),
dep_req("_7GYt6", "=2.5.4"),
Expand All @@ -1162,7 +1147,6 @@ fn dont_yet_know_the_problem() {
dep_req("A", ">=2.2.3,<=5.1.1"),
dep_req("B", ">=4.0.1,<=5.1.3"),
dep_req("C", "=0.0.0"),
dep_req("D", "=1.1.5"),
dep_req("E", "=0.0.4"),
dep_req("F", ">=0.5.5,<=2.3.2"),
dep_req("I-_eFdfZc___Aw-_W-VNtF", "=4.0.4"),
Expand All @@ -1173,7 +1157,7 @@ fn dont_yet_know_the_problem() {
dep_req("j5k-6_4A55l-o-KAh", "=4.3.5")]),
pkg!(("s", "1.5.2") => [
dep_req("A", ">=2.2.3,<=5.5.2"),
dep_req("D", "=1.1.5"),
dep_req("C", "=0.0.0"),
dep_req("E", ">=0.0.4,<=3.5.2"),
dep_req("_7GYt6", ">=3.4.4,<=4.3.1"),
dep_req("b_SvYO8", "=5.4.3"),
Expand Down