Merge branch 'main' into instrument_otel

rigetti · Jan 9, 2024 · dea3e23 · dea3e23
2 parents 1f1a857 + 2d0a59e
commit dea3e23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -1,5 +1,9 @@
 name: Run Checks
-on: [push]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   checks:

diff --git a/crates/lib/src/executable.rs b/crates/lib/src/executable.rs
@@ -701,15 +701,15 @@ impl From<ExecutionError> for Error {
             ExecutionError::Unexpected(inner) => Self::Unexpected(format!("{inner:?}")),
             ExecutionError::Quilc { .. } => Self::Connection(Service::Quilc),
             ExecutionError::QcsClient(v) => Self::Unexpected(format!("{v:?}")),
-            ExecutionError::IsaError(v) => Self::Unexpected(format!("{v:?}")),
+            ExecutionError::Isa(v) => Self::Unexpected(format!("{v:?}")),
             ExecutionError::ReadoutParse(v) => Self::Unexpected(format!("{v:?}")),
             ExecutionError::Quil(e) => Self::Quil(e),
             ExecutionError::ToQuil(e) => Self::ToQuil(e),
             ExecutionError::Compilation { details } => Self::Compilation(details),
             ExecutionError::RewriteArithmetic(e) => Self::RewriteArithmetic(e),
             ExecutionError::RpcqClient(e) => Self::Unexpected(format!("{e:?}")),
             ExecutionError::Substitution(message) => Self::Substitution(message),
-            ExecutionError::QpuApiError(e) => Self::QpuApiError(e),
+            ExecutionError::QpuApi(e) => Self::QpuApiError(e),
         }
     }
 }

diff --git a/crates/lib/src/lib.rs b/crates/lib/src/lib.rs
@@ -30,7 +30,6 @@
     path_statements,
     patterns_in_fns_without_body,
     pointer_structural_match,
-    private_in_public,
     semicolon_in_expressions_from_macros,
     trivial_casts,
     trivial_numeric_casts,

diff --git a/crates/lib/src/qpu/execution.rs b/crates/lib/src/qpu/execution.rs
@@ -52,7 +52,7 @@ pub(crate) enum Error {
     #[error("Problem using QCS API: {0}")]
     QcsClient(#[from] GrpcClientError),
     #[error("Problem fetching ISA: {0}")]
-    IsaError(#[from] GetIsaError),
+    Isa(#[from] GetIsaError),
     #[error("Problem parsing memory readout: {0}")]
     ReadoutParse(#[from] MemoryReferenceParseError),
     #[error("Problem when compiling program: {details}")]
@@ -64,7 +64,7 @@ pub(crate) enum Error {
     #[error("Program when getting substitutions for program: {0}")]
     Substitution(String),
     #[error("Problem making a request to the QPU: {0}")]
-    QpuApiError(#[from] super::api::QpuApiError),
+    QpuApi(#[from] super::api::QpuApiError),
 }
 
 impl From<quilc::Error> for Error {