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

deps: update cpufeatures, swap difference to dissimilar #104824

Merged
merged 1 commit into from
Dec 5, 2022

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Nov 24, 2022

Updating cpufeatures v0.2.1 -> v0.2.5: https://github.com/RustCrypto/utils/blob/master/cpufeatures/CHANGELOG.md#025-2022-09-04, was yanked bc of miscompile (RustCrypto/utils#800, #101346)

Removing difference v2.0.0
Adding dissimilar v1.0.4
Updating expect-test v1.0.1 -> v1.4.0

difference unmaintened https://rustsec.org/advisories/RUSTSEC-2020-0095.html, so replaced with https://github.com/dtolnay/dissimilar (as dependency of expect-test)

@rustbot
Copy link
Collaborator

rustbot commented Nov 24, 2022

r? @Mark-Simulacrum

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

@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 Nov 24, 2022
@klensy
Copy link
Contributor Author

klensy commented Nov 24, 2022

tidy error: invalid license `Apache-2.0` in `dissimilar 1.0.4 should this be added to exceptions list in tidy, or fixed in crate as dual mit/apache license (as noted in readme https://github.com/dtolnay/dissimilar/blob/master/README.md#license)?

@rust-log-analyzer

This comment has been minimized.

@Mark-Simulacrum
Copy link
Member

dissimilar is only available under Apache 2.0; new contributions to it and anything unique to that repository are MIT or Apache 2.0 licensed, but that's not sufficient to make use of it under just MIT terms.

I think the best bet is going to be adding it to the exceptions list, we have other Apache 2.0-only libraries there so that seems fine to me.

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 27, 2022
@klensy
Copy link
Contributor Author

klensy commented Nov 28, 2022

@rustbot ready

added exception and updated required versions of expect-test in Cargo.toml's

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Dec 5, 2022

📌 Commit ceee880 has been approved by Mark-Simulacrum

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 Dec 5, 2022
@bors
Copy link
Contributor

bors commented Dec 5, 2022

⌛ Testing commit ceee880 with merge e72ea1d...

@bors
Copy link
Contributor

bors commented Dec 5, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing e72ea1d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 5, 2022
@bors bors merged commit e72ea1d into rust-lang:master Dec 5, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 5, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e72ea1d): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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)
5.3% [5.3%, 5.3%] 1
Improvements ✅
(primary)
-2.1% [-3.5%, -0.9%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.1% [-3.5%, -0.9%] 4

Cycles

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)
2.3% [2.2%, 2.3%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
deps: update cpufeatures, swap difference to dissimilar

Updating cpufeatures v0.2.1 -> v0.2.5: https://github.com/RustCrypto/utils/blob/master/cpufeatures/CHANGELOG.md#025-2022-09-04, was yanked bc of miscompile (RustCrypto/utils#800, rust-lang#101346)

Removing difference v2.0.0
     Adding dissimilar v1.0.4
   Updating expect-test v1.0.1 -> v1.4.0

difference unmaintened https://rustsec.org/advisories/RUSTSEC-2020-0095.html, so replaced with https://github.com/dtolnay/dissimilar (as dependency of `expect-test`)
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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants