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

Update cargo #106330

Merged
merged 1 commit into from
Jan 4, 2023
Merged

Update cargo #106330

merged 1 commit into from
Jan 4, 2023

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Dec 31, 2022

8 commits in 2381cbdb4e9b07090f552d34a44a529b6e620e44..8c460b2237a6359a7e3335890db8da049bdd62fc
2022-12-23 12:19:27 +0000 to 2023-01-04 14:30:01 +0000

Also update license exceptions and permitted dependencies
for new cargo dependency "pasetors".

A new dependency getrandom is added into rustc-workspace-hacks,
since it requires feature js.

r? @ghost

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 31, 2022
@rustbot
Copy link
Collaborator

rustbot commented Dec 31, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

@ehuss, please help review this update. I am not quite sure the change of PERMITTED_RUSTC_DEPENDENCIES. Looks like pasetors enables js feature by default.

@ehuss
Copy link
Contributor

ehuss commented Dec 31, 2022

Hm, that's unfortunate.

I'm wondering if it would be a good idea to filter out wasm32 from the permitted list? WDYT? I hacked up a solution here: ehuss@a9ec95b

That commit also fixes a bug where it was not removing some extra entries from the permitted list.

I'd like to rope in @Mark-Simulacrum to see if you think it would be reasonable to filter out wasm32 from the tidy permitted dependency list for rustc and cranelift? The idea is to keep the list cleaner by removing dependencies that would never actually be used in rustc.

@weihanglo
Copy link
Member Author

That looks neat to me!

If we need more discussions on a proper fix, should we not block this PR and proceed?

@ehuss
Copy link
Contributor

ehuss commented Jan 3, 2023

That's fair. I'll go ahead and approve this, and then follow up with a PR with my proposed change to keep the tidy list tidier.

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Jan 3, 2023

📌 Commit 323938c34f99801bcd3577e8c8a5816c3b73f9f7 has been approved by ehuss

It is now in the queue for this repository.

@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 Jan 3, 2023
@ehuss
Copy link
Contributor

ehuss commented Jan 3, 2023

Looks like some issue with bors, it didn't actually get into the queue.

@ehuss ehuss closed this Jan 3, 2023
@ehuss ehuss reopened this Jan 3, 2023
@bors
Copy link
Contributor

bors commented Jan 3, 2023

⌛ Testing commit 323938c34f99801bcd3577e8c8a5816c3b73f9f7 with merge 6bf7396ed651febcd9e89831eebe23f8e560142d...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jan 3, 2023

💔 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 Jan 3, 2023
@weihanglo
Copy link
Member Author

Ohh no. Now we need to force everybody to enable features ["wasm-bindgen", "js", "js-sys"] for getrandom. Does this still look good?

@klensy
Copy link
Contributor

klensy commented Jan 4, 2023

Ohh no. Now we need to force everybody to enable features ["wasm-bindgen", "js", "js-sys"] for getrandom. Does this still look good?

Not nice. Why not disable this features in newly introduced dependency (or pr/ask maintainer to do that)?

@ehuss
Copy link
Contributor

ehuss commented Jan 4, 2023

Enabling js on getrandom in the workspace-hack seems fine. Those dependencies aren't otherwise built, and it will have no effect.

8 commits in 2381cbdb4e9b07090f552d34a44a529b6e620e44..8c460b2237a6359a7e3335890db8da049bdd62fc
2022-12-23 12:19:27 +0000 to 2023-01-04 14:30:01 +0000
- test: revive nightly plugin tests to work (rust-lang/cargo#11534)
- Add note to release notes about rejecting multiple registries. (rust-lang/cargo#11531)
- Fix a typo `fresheness` -> `freshness` (rust-lang/cargo#11529)
- Reasons for rebuilding (rust-lang/cargo#11407)
- Asymmetric tokens (rust-lang/cargo#10771)
- Use proper git URL for GitHub repos (rust-lang/cargo#11517)
- Add `registry.default` example (rust-lang/cargo#11516)
- Support vendoring with different revs from same git repo (rust-lang/cargo#10690)

Also update license exceptions and permitted dependencies
for new cargo dependency "pasetors".

A new dependency `getrandom` is added into `rustc-workspace-hacks`,
since it requires feature `js`.
@weihanglo
Copy link
Member Author

Enabled that with a rebase. Will merge it now.
Feel free to cancel if I did it wrong.

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Jan 4, 2023

📌 Commit 6306fd3 has been approved by weihanglo

It is now in the queue for this repository.

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

bors commented Jan 4, 2023

⌛ Testing commit 6306fd3 with merge 659e169...

@bors
Copy link
Contributor

bors commented Jan 4, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 659e169 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 4, 2023
@bors bors merged commit 659e169 into rust-lang:master Jan 4, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 4, 2023
@weihanglo weihanglo deleted the update-cargo branch January 4, 2023 22:44
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (659e169): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.2% [-3.2%, -3.2%] 1
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants