Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:noname
Aug 31, 2020
Merged

cleanup: Remove duplicate library names from Cargo.tomls#74668
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:noname

Conversation

@petrochenkov

@petrochenkovpetrochenkov commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

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

matklad commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

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

@tshepang

tshepang commented Jul 23, 2020

Copy link
Copy Markdown
Member

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

@matklad

matklad commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

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

@petrochenkov

petrochenkov commented Jul 23, 2020

Copy link
Copy Markdown
ContributorAuthor

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

matklad commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

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

@nikomatsakisnikomatsakis added S-blocked Status: 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

nikomatsakis commented Jul 27, 2020

Copy link
Copy Markdown
Contributor

ok, marking as blocked on #73265 I guess

@bors

This comment has been minimized.

Sign in to view
@petrochenkov

petrochenkov commented Jul 28, 2020

Copy link
Copy Markdown
ContributorAuthor

Blocked on #74862.

@petrochenkovpetrochenkov 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: Blocked on something else such as an RFC or other implementation work. labels Aug 30, 2020
@petrochenkov

petrochenkov commented Aug 30, 2020

Copy link
Copy Markdown
ContributorAuthor

r? @mark-i-m

@petrochenkovpetrochenkov 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
Comment threadcompiler/rustc/Cargo.toml Outdated
@mark-i-m

mark-i-m commented Aug 30, 2020

Copy link
Copy Markdown
Contributor

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

@petrochenkov

petrochenkov commented Aug 30, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

@bors

bors commented Aug 30, 2020

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Aug 30, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors 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

bors commented Aug 30, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7dfbf59 with merge fba84a1c32c011e5b75e44d6017d2c4752b225f4...

@bors

bors commented Aug 30, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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

petrochenkov commented Aug 30, 2020

Copy link
Copy Markdown
ContributorAuthor
---- 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

@borsbors 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 ofrust-lang#74668- petrochenkov:noname, r=mark-i-m
096b49c
cleanup: Remove duplicate library names from `Cargo.toml`s
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Aug 30, 2020
Closed
@bors

bors commented Aug 30, 2020

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2020
@bors
bors merged commit 022e1fe into rust-lang:masterAug 31, 2020
@cuvipercuviper added this to the 1.48.0 milestone May 2, 2024
@petrochenkov
petrochenkov deleted the noname branch February 22, 2025 18:45
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@mark-i-mmark-i-mmark-i-m approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@mark-i-mmark-i-m

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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