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

Fix issues #4798

Merged
merged 2 commits into from
Jan 9, 2018
Merged

Fix issues #4798

merged 2 commits into from
Jan 9, 2018

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Dec 9, 2017

Fixes #4786.

@@ -308,7 +308,7 @@ resolve to 1.0.1 inside the repository instead of trying to download a version
from crates.io. Once 1.0.1 is published on crates.io the `[patch]` section can
be deleted.

It's also worth nothing that `[patch]` applies *transitively*. Let's say you use
It's also worth nothing that `[patch]` applies at the *top level*. Let's say you use
Copy link
Member

Choose a reason for hiding this comment

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

This I believe isn't correct, the point of [patch] is to apply transitively to the entire crate graph.

Copy link
Member Author

Choose a reason for hiding this comment

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

So the second declaration is the incorrect one? (just a few lines below)

Copy link
Member

Choose a reason for hiding this comment

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

Sort of. I think the one below just needs to be clarified. The [patch] section can only be defined at the top-level but its effects are transitive throughout the crate graph.

@bors
Copy link
Contributor

bors commented Jan 5, 2018

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

@GuillaumeGomez
Copy link
Member Author

Updated.

@@ -308,7 +308,7 @@ resolve to 1.0.1 inside the repository instead of trying to download a version
from crates.io. Once 1.0.1 is published on crates.io the `[patch]` section can
be deleted.

It's also worth nothing that `[patch]` applies *transitively*. Let's say you use
It's also worth nothing that `[patch]` applies at the *transitively*. Let's say you use
Copy link
Member

Choose a reason for hiding this comment

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

Stray "at the"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oups, forgot this one...


In case the dependency you want to override isn't loaded from `crates.io`, you'll have to change a bit how you use `[patch]`:

```
Copy link
Member

Choose a reason for hiding this comment

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

This may want to mention "toml" as the language?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure!

@GuillaumeGomez
Copy link
Member Author

Updated.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 8, 2018

📌 Commit fb12480 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 8, 2018

⌛ Testing commit fb12480 with merge 9275e0d...

bors added a commit that referenced this pull request Jan 8, 2018
@bors
Copy link
Contributor

bors commented Jan 9, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 9275e0d to master...

@bors bors merged commit fb12480 into rust-lang:master Jan 9, 2018
@GuillaumeGomez GuillaumeGomez deleted the patch-1 branch January 9, 2018 08:54
@ehuss ehuss added this to the 1.25.0 milestone Feb 6, 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.

Confusing statement in the [patch] docs
4 participants