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

Relax overly strict asserts in dependency queue #3921

Merged
merged 1 commit into from
Apr 26, 2017

Conversation

alexcrichton
Copy link
Member

Don't actually need to assert that these are unique, it works both ways and we
can have flavorful dependency graphs which otherwise trigger the assertions.

Closes #3902

@rust-highfive
Copy link

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Contributor

bors commented Apr 26, 2017

☔ The latest upstream changes (presumably #3947) made this pull request unmergeable. Please resolve the merge conflicts.

Don't actually need to assert that these are unique, it works both ways and we
can have flavorful dependency graphs which otherwise trigger the assertions.

Closes rust-lang#3902
@alexcrichton
Copy link
Member Author

r? @matklad

@rust-highfive rust-highfive assigned matklad and unassigned brson Apr 26, 2017
@matklad
Copy link
Member

matklad commented Apr 26, 2017

Hm, I would say that [dev-dependencies] foo = { path = "." } should be an error, because the library itself is already included in the dependencies of integration tests.

@alexcrichton
Copy link
Member Author

Yeah I felt the same way but couldn't find an easy way to implement that with resolve today so I figured I'd just let it slide as it's harmless anyway. This'd just take more effort to figure out how to reject this case.

@matklad
Copy link
Member

matklad commented Apr 26, 2017

Yeah, accepting it is better then panicking!

@bors r+

@bors
Copy link
Contributor

bors commented Apr 26, 2017

📌 Commit 2511141 has been approved by matklad

@bors
Copy link
Contributor

bors commented Apr 26, 2017

⌛ Testing commit 2511141 with merge fa7584c...

bors added a commit that referenced this pull request Apr 26, 2017
Relax overly strict asserts in dependency queue

Don't actually need to assert that these are unique, it works both ways and we
can have flavorful dependency graphs which otherwise trigger the assertions.

Closes #3902
@bors
Copy link
Contributor

bors commented Apr 26, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: matklad
Pushing fa7584c to master...

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.

Panic when adding cyclic dev-dependency
6 participants