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

Bump hashbrown to 0.14.0. #10540

Merged
merged 4 commits into from
Aug 15, 2023
Merged

Bump hashbrown to 0.14.0. #10540

merged 4 commits into from
Aug 15, 2023

Conversation

kevinhartman
Copy link
Contributor

Summary

Bumping this back to what it was before #10366 now that rustworkx's version of hashbrown has been updated.

Details and comments

We can't move to hashbrown 0.14.0 yet because it requires rustc 1.64+.

@kevinhartman kevinhartman requested a review from a team as a code owner July 31, 2023 22:17
@qiskit-bot
Copy link
Collaborator

One or more of the the following people are requested to review this:

@jakelishman
Copy link
Member

If the only thing holding back hashbrown 0.14 at this point is Rust 1.64, we could do both as part of #10541?

@mtreinish mtreinish added Changelog: None Do not include in changelog Rust This PR or issue is related to Rust code in the repository labels Jul 31, 2023
mtreinish
mtreinish previously approved these changes Jul 31, 2023
View reviewed changes
Copy link
Member

@mtreinish mtreinish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, glad to see rustworkx 0.13.1 fixed this

@mtreinish mtreinish enabled auto-merge July 31, 2023 23:05
@mtreinish mtreinish disabled auto-merge July 31, 2023 23:07
@kevinhartman
Copy link
Contributor Author

If the only thing holding back hashbrown 0.14 at this point is Rust 1.64, we could do both as part of #10541?

I'm fine with this, but actually, Rustworkx depends on hashbrown@0.13. Overriding the Rust version used by Rustworkx to something newer in Qiskit was causing issues originally, which is why I'd downgraded us to 0.12 before (when Rustworkx was on 0.12). They really do break the API between minor versions (at least when they're still at major version 0).

@jakelishman
Copy link
Member

I made Qiskit/rustworkx#956 that would make rustworkx-core compatible with a couple of versions of hashbrown, which I was able to use to build Terra (using a modified version of #10541 that upped the dependency on rustworkx-core to =0.14.0 locally) using both hashbrown 0.13 and hashbrown 0.14 as I chose.

@mtreinish mtreinish mentioned this pull request Aug 3, 2023
Merged
mtreinish
mtreinish reviewed Aug 10, 2023
View reviewed changes
crates/accelerate/Cargo.toml Outdated
@@ -29,7 +29,7 @@ version = "^0.15.6"
features = ["rayon"]

[dependencies.hashbrown]
version = "0.12.3"
version = "0.13.2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With #10541 merged now we can bump the hashbrown version to 0.14.0 because our msrv is 1.64.

Suggested change
version = "0.13.2"
version = "0.14.0"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these would need to come along with updates to the lock file as well, so probably better not to do inline?

crates/qasm2/Cargo.toml Outdated
@@ -10,5 +10,5 @@ name = "qiskit_qasm2"
crate-type = ["cdylib"]

[dependencies]
hashbrown = "0.12.3"
hashbrown = "0.13.2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
hashbrown = "0.13.2"
hashbrown = "0.14.0"

@coveralls
Copy link

coveralls commented Aug 10, 2023 •
edited
Loading

Pull Request Test Coverage Report for Build 5870454687

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 20 unchanged lines in 3 files lost coverage.
  • Overall coverage decreased (-0.02%) to 87.251%
Files with Coverage Reduction New Missed Lines %
qiskit/pulse/library/waveform.py 3 93.75%
crates/qasm2/src/lex.rs 5 90.63%
crates/qasm2/src/parse.rs 12 97.13%
Totals Coverage Status
Change from base Build 5870333814: -0.02%
Covered Lines: 74292
Relevant Lines: 85147
💛 - Coveralls

@kevinhartman kevinhartman changed the title Bump hashbrown to 0.13.2. Bump hashbrown to 0.14.0. Aug 15, 2023
mtreinish
mtreinish approved these changes Aug 15, 2023
View reviewed changes
Copy link
Member

@mtreinish mtreinish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for sticking with this and updating this after we bumped the MSRV

@mtreinish mtreinish added this pull request to the merge queue Aug 15, 2023
Merged via the queue into Qiskit:main with commit 2062246 Aug 15, 2023
13 checks passed
SamD-1998 pushed a commit to SamD-1998/qiskit-terra that referenced this pull request Sep 7, 2023
@kevinhartman @SamD-1998
Bump hashbrown to 0.14.0. (Qiskit#10540)
9a8edc2 
* Bump hashbrown to 0.13.2.

* Bump hashbrown to 0.14.0 and indexmap to 2.0.0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakelishman jakelishman jakelishman left review comments

@mtreinish mtreinish mtreinish approved these changes

Assignees
No one assigned
Labels
Changelog: None Do not include in changelog Rust This PR or issue is related to Rust code in the repository
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kevinhartman @qiskit-bot @jakelishman @coveralls @mtreinish