-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Update Cargo.lock #53075
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 Cargo.lock #53075
Conversation
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Looks good to me! r=me with travis passing |
@@ -22,3 +22,4 @@ crate-type = ["dylib"] | |||
[dependencies] | |||
bitflags = "1.0" | |||
log = "0.4" | |||
unicode_width = "0.1.4" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(should be unicode-width
with a hyphen)
9960ea9
to
27b2a27
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
27b2a27
to
6377cf0
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Okay, I guess adding unicode_width the the crates.io shim isn't quite enough. I'll try to find some time later today to investigate why. |
@alexcrichton Okay, I've spent some more time on this and either I just don't understand how rustc works or I'm missing something:
A slight complication is that It's also not clear to me why we have both the crates io shim crate and librustc has a few 'fake' dependencies itself. Shouldn't they serve the same purpose? |
@Mark-Simulacrum to fix this the compiler shouldn't depend on Otherwise one copy is coming from the |
6377cf0
to
9f20e51
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
9f20e51
to
39edabd
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
39edabd
to
78ee164
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
78ee164
to
01a41d8
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Ping from triage @Mark-Simulacrum! Do you think you'll be able to continue to work on this? |
I'll get to this soon hopefully. |
01a41d8
to
b83e49c
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
b83e49c
to
09731fb
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
📌 Commit 182a196474bf2ac7c651555074aa982ab56cd896 has been approved by |
☔ The latest upstream changes (presumably #52953) made this pull request unmergeable. Please resolve the merge conflicts. |
6ac290e
to
83d21f2
Compare
@bors r=alexcrichton |
📌 Commit 83d21f2702c023f4a1fa8091646430c0ad43eb84 has been approved by |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
☔ The latest upstream changes (presumably #53567) made this pull request unmergeable. Please resolve the merge conflicts. |
Ping from triage @Mark-Simulacrum: This PR needs to be rebased. |
83d21f2
to
c1e89e4
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
c1e89e4
to
2d70448
Compare
2d70448
to
9ec5ef5
Compare
@bors r=alexcrichton |
📌 Commit 9ec5ef5 has been approved by |
Update Cargo.lock This also includes major version bumps for the rand crate used by core, std, and alloc tests, among other crates (regex, etc.) used elsewhere. Since these are all internal there should be no user-visible changes. r? @alexcrichton
☀️ Test successful - status-appveyor, status-travis |
This also includes major version bumps for the rand crate used by core, std, and alloc tests, among other crates (regex, etc.) used elsewhere. Since these are all internal there should be no user-visible changes.
r? @alexcrichton