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

Adding from_designator + notes for usage #222

Closed
wants to merge 6 commits into from
Closed

Conversation

abhamra
Copy link
Contributor

@abhamra abhamra commented May 29, 2024

Fixes #170: minor changes because error handling for designators within this file wasn't standardized and should stay separated.

@CLAassistant
Copy link

CLAassistant commented May 29, 2024

CLA assistant check
All committers have signed the CLA.

atomgardner and others added 3 commits May 31, 2024 17:32
In CI this often fails even if it succeeds locally.

* Limit the version of triomphe to 0.1.11 because 0.1.12 uses unstable features
* Remove some conditional compilation for clippy complaints. Maybe clippy was upgraded independently of rustc?
* Factor lowering a list of qubits into a helper function

fixes: Qiskit#163

* Update crates/oq3_semantics/src/syntax_to_semantics.rs

remove comments that were moved elsewhere

* Update crates/oq3_semantics/src/syntax_to_semantics.rs

Move a comment from elsewhere to here, where it makes more sense.

* Run cargo fmt

---------

Co-authored-by: John Lapeyre <[email protected]>
@jlapeyre
Copy link
Collaborator

jlapeyre commented Jun 7, 2024

This PR has a merge conflict. probably because main was updated. I think the updated main branch will fix the CI failure above.

@abhamra
Copy link
Contributor Author

abhamra commented Jun 8, 2024

This PR has a merge conflict. probably because main was updated. I think the updated main branch will fix the CI failure above.

Just rebased my fork, ideally should have fixed the issues.

@jlapeyre
Copy link
Collaborator

jlapeyre commented Jun 11, 2024

It's more convenient for the feature branch to have a name other than main. For example, I already have a local branch named main.

This PR should be rebased on the latest main, which includes #221 . .... maybe it is. but edits from #221 are showing up in the online diff here.

@abhamra
Copy link
Contributor Author

abhamra commented Jun 11, 2024

@jlapeyre I see what you mean; I'm reasonably confident I have the changes from main, I think I will make a new PR with a new branch name that doesn't conflict, something like from_designator_fix. The code should be unchanged, just a new PR without the conflict.

@jlapeyre
Copy link
Collaborator

Obsolete. Replaced by #224

@jlapeyre jlapeyre closed this Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement function from_designator in syntax_to_semantics.rs
4 participants