Skip to content

Commit

Permalink
Auto merge of #6006 - EPashkin:master, r=alexcrichton
Browse files Browse the repository at this point in the history
Fix example for usage still not published uuid 2.0.0

IMHO There some inconsistency in https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#prepublishing-a-breaking-change
We have unpublished version 2.0.0 for uuid crate in branch with same name.
Now we can test it in `my-library` without waiting for publish as written in docs.
But if `my-library` changes committed to its master, for `my-binary` patch need be same as in library,
as uuid 2.0.0 still not published.
  • Loading branch information
bors committed Sep 11, 2018
2 parents c1c4fc2 + 45dea14 commit b0679d5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/doc/src/reference/specifying-dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ my-library = { git = 'https://example.com/git/my-library' }
uuid = "1.0"

[patch.crates-io]
uuid = { git = 'https://github.com/rust-lang-nursery/uuid', version = '2.0.0' }
uuid = { git = 'https://github.com/rust-lang-nursery/uuid', branch = '2.0.0' }
```

Note that this will actually resolve to two versions of the `uuid` crate. The
Expand Down

0 comments on commit b0679d5

Please sign in to comment.