Upgrade: Switch to released version of quil-rs

.releaserc.yml

@@ -9,6 +9,8 @@ plugins:
           release: minor
         - tag: Update
           release: patch
+        - tag: Upgrade
+          release: patch
         - tag: New
           release: patch
   - - '@semantic-release/release-notes-generator'

qcs/Cargo.toml

@@ -21,7 +21,7 @@ lazy_static = "1.4.0"
 log = "0.4.14"
 num = "0.4.0"
 qcs-api = { version ="0.0.1", path = "../qcs-api" }
-quil = { version = "0.5.0", git = "https://github.com/rigetti/quil-rust.git", branch = "sdk-requirements" }
+quil-rs = "0.8.0"
 reqwest = { version = "0.11.4", features = ["rustls", "json"] }
 rmp-serde = "0.15.5"
 serde = { version = "1.0.126", features = ["derive"] }

qcs/src/qpu/execution.rs

@@ -5,7 +5,7 @@ use std::convert::TryFrom;
 
 use eyre::{eyre, Report, Result, WrapErr};
 use log::trace;
-use quil::expression::Expression;
+use quil_rs::expression::Expression;
 
 use qcs_api::models::EngagementWithCredentials;
 

qcs/src/qpu/quilc/mod.rs

@@ -3,7 +3,7 @@ use std::convert::TryFrom;
 use std::str::FromStr;
 
 use eyre::{Report, Result, WrapErr};
-use quil::Program;
+use quil_rs::Program;
 use serde::{Deserialize, Serialize};
 
 use isa::CompilerIsa;
@@ -60,7 +60,7 @@ impl From<NativeQuil> for String {
 /// A wrapper around [`Program`] which indicates it has been converted to `NativeQuil` (has been run
 /// through `quilc` and therefore is suitable to use on QPUs.
 #[derive(Debug, PartialEq)]
-pub struct NativeQuilProgram(Program);
+pub(super) struct NativeQuilProgram(Program);
 
 impl TryFrom<NativeQuil> for NativeQuilProgram {
     type Error = Report;

qcs/src/qpu/rewrite_arithmetic.rs

@@ -3,13 +3,15 @@ use std::convert::TryFrom;
 use eyre::{eyre, Report, Result};
 use indexmap::set::IndexSet;
 use num::complex::Complex64;
-use quil::expression::{Expression, InfixOperator};
-use quil::instruction::{
-    AttributeValue, FrameIdentifier, Gate, Instruction, MemoryReference, ScalarType, SetFrequency,
-    SetPhase, SetScale, ShiftFrequency, ShiftPhase, Vector,
+use quil_rs::{
+    expression::{Expression, InfixOperator},
+    instruction::{
+        AttributeValue, FrameIdentifier, Gate, Instruction, MemoryReference, ScalarType,
+        SetFrequency, SetPhase, SetScale, ShiftFrequency, ShiftPhase, Vector,
+    },
+    program::{FrameSet, MemoryRegion},
+    Program,
 };
-use quil::program::{FrameSet, MemoryRegion};
-use quil::Program;
 
 use crate::qpu::quilc::NativeQuilProgram;
 

qcs/src/qvm/execution.rs

@@ -1,15 +1,17 @@
+use std::collections::HashMap;
 use std::str::FromStr;
 
 use eyre::{eyre, Result, WrapErr};
-use quil::instruction::{ArithmeticOperand, Instruction, MemoryReference, Move};
-use quil::Program;
+use quil_rs::{
+    instruction::{ArithmeticOperand, Instruction, MemoryReference, Move},
+    Program,
+};
 
 use crate::configuration::Configuration;
 use crate::executable::Parameters;
 use crate::ExecutionResult;
 
 use super::{QVMRequest, QVMResponse};
-use std::collections::HashMap;
 
 /// Contains all the info needed to execute on a QVM a single time, with the ability to be reused for
 /// faster subsequent runs.