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

Jump to bottom

cleanup: Remove duplicate library names from Cargo.tomls #74668

Merged
merged 1 commit into from
Aug 31, 2020
Merged

cleanup: Remove duplicate library names from Cargo.tomls #74668

merged 1 commit into from
Aug 31, 2020

Conversation

petrochenkov
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2020
@matklad
Copy link
Member

matklad commented Jul 23, 2020

Should we do this after #73265 perhaps? We'll be able to remove path= as well.

@tshepang
Copy link
Member

@matklad is it a new feature for it to work without needing to specify path=?

@matklad
Copy link
Member

matklad commented Jul 23, 2020

No, #73265 in its current form just proposes to leverage standard cargo's convetion, which doesn't require explicit config.

@petrochenkov
Copy link
Contributor Author

Should we do this after #73265 perhaps?

Yeah, this can be done as a part of the std move (#73265) or as a part of the compiler move (majority of the changes), or separately.
Neither makes git history harder to follow, so there's probably not much difference.

@matklad
Copy link
Member

matklad commented Jul 23, 2020

There's differnce in how annoying is #73265 to rebase though :)

@nikomatsakis nikomatsakis added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 27, 2020
@nikomatsakis
Copy link
Contributor

ok, marking as blocked on #73265 I guess

@bors

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor Author

Blocked on #74862.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Aug 30, 2020
@petrochenkov
Copy link
Contributor Author

r? @mark-i-m

@petrochenkov petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 30, 2020
mark-i-m
mark-i-m suggested changes Aug 30, 2020
View reviewed changes
compiler/rustc/Cargo.toml Show resolved Hide resolved
@mark-i-m
Copy link
Member

Other than the above, r=me (but I don't have bors priveleges).

@petrochenkov
Copy link
Contributor Author

petrochenkov commented Aug 30, 2020 •
edited
Loading

@bors delegate=mark-i-m
@bors r=mark-i-m

@bors
Copy link
Contributor

bors commented Aug 30, 2020

✌️ @mark-i-m can now approve this pull request

@bors
Copy link
Contributor

bors commented Aug 30, 2020

📌 Commit 7dfbf59 has been approved by mark-i-m

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 30, 2020
@bors
Copy link
Contributor

bors commented Aug 30, 2020

⌛ Testing commit 7dfbf59 with merge fba84a1c32c011e5b75e44d6017d2c4752b225f4...

@bors
Copy link
Contributor

bors commented Aug 30, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 30, 2020
@petrochenkov
Copy link
Contributor Author 

---- build::close_output stdout ----
thread 'build::close_output' panicked at 'lines differ:
   Compiling foo v0.1.0 (D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t215\foo)
error: The pipe is being closed. (os error 232)
warning: build failed, waiting for other jobs to finish...
hello stderr!
error: build failed
', src\tools\cargo\tests\testsuite\build.rs:5043:5

Looks spurious.
@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 30, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Aug 30, 2020
@Dylan-DPC
Rollup merge of rust-lang#74668 - petrochenkov:noname, r=mark-i-m
096b49c 
cleanup: Remove duplicate library names from `Cargo.toml`s
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Aug 30, 2020
Closed
@bors
Copy link
Contributor

bors commented Aug 30, 2020

⌛ Testing commit 7dfbf59 with merge 022e1fe...

@bors
Copy link
Contributor

bors commented Aug 31, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: mark-i-m
Pushing 022e1fe to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2020
@bors bors merged commit 022e1fe into rust-lang:master Aug 31, 2020
@cuviper cuviper added this to the 1.48.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mark-i-m mark-i-m mark-i-m approved these changes

Assignees

@mark-i-m mark-i-m

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.
8 participants
@petrochenkov @rust-highfive @matklad @tshepang @nikomatsakis @bors @mark-i-m @cuviper