Clean up repo and dependencies (#194)

* Clean up repo and dependencies This PR makes several changes to clean-up/streamline the repository: - Moves package version, authos, edition, and license to the workspace level to make updates easier. - Moves all dependency version specification to the workspace to make tracking and updating dependencies easier. - Removes dependabot.yml in favor of manual updates, so syncing with ADO release builds crate availability is easier. - Downgrades clap to 4.5.7 for compatibility with ADO. - Removes the rust toolchain file and fixes clippy warnings for 1.78. - Pins to specific release of inkwell rather than using branch master for better predictability. * Fix clippy 1.79 lints * Move inkwell to workspace
qir-alliance · Jul 2, 2024 · 60e07ab · 60e07ab
1 parent edad2e6
commit 60e07ab
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 77 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,8 +8,27 @@ members = [
 ]
 resolver = "2"
 
+[workspace.package]
+authors = ["Microsoft"]
+homepage = "https://github.com/qir-alliance/qir-runner"
+repository = "https://github.com/qir-alliance/qir-runner"
+edition = "2021"
+license = "MIT"
+version = "0.7.1"
+
 [profile.release]
 debug = 1
 
 [workspace.dependencies]
-pyo3 = "0.20"
+bitvec = "1.0.0"
+clap = { version = "4.5.7", features = [ "cargo" ] }
+criterion = "0.5.1"
+inkwell = { git = "https://github.com/TheDan64/inkwell", rev = "0.4.0", default-features = false, features = ["llvm14-0"] }
+msvc_spectre_libs = { version = "0.1", features = [ "error" ] }
+ndarray = "0.15.4"
+num-bigint = { version = "0.4.6", default-features = false }
+num-complex = "0.4"
+num-traits = "0.2.19"
+pyo3 = "0.20"
+rand = "0.8.5"
+rustc-hash = "1.1.0"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -1,20 +1,22 @@
 [package]
 name = "qir-backend"
-version = "0.7.1"
-authors = ["Microsoft"]
-edition = "2021"
-license = "MIT"
+version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+license.workspace = true
 
 [dependencies]
 qir-stdlib = { path = "../stdlib" }
 quantum-sparse-sim = { path = "../sparsesim" }
-rand = "0.8.5"
-num-complex = "0.4"
-num-bigint = { version = "0.4.6", default-features = false }
-bitvec = "1.0.0"
+rand = { workspace = true }
+num-complex = { workspace = true }
+num-bigint = { workspace = true }
+bitvec = { workspace = true }
 
 [dev-dependencies]
-criterion = "0.5.1"
+criterion = { workspace = true }
 
 [[bench]]
 name = "gates"

diff --git a/backend/src/lib.rs b/backend/src/lib.rs
@@ -306,6 +306,7 @@ macro_rules! multicontrolled_qubit_gate {
         ///
         /// This function should only be called with arrays and tuples created by the QIR runtime library.
         #[no_mangle]
+        #[allow(clippy::cast_ptr_alignment)]
         pub unsafe extern "C" fn $qir_name(ctls: *const QirArray, qubit: *mut c_void) {
             SIM_STATE.with(|sim_state| {
                 let state = &mut *sim_state.borrow_mut();
@@ -382,6 +383,7 @@ macro_rules! multicontrolled_qubit_rotation {
         ///
         /// This function should only be called with arrays and tuples created by the QIR runtime library.
         #[no_mangle]
+        #[allow(clippy::cast_ptr_alignment)]
         pub unsafe extern "C" fn $qir_name(
             ctls: *const QirArray,
             arg_tuple: *mut *const Vec<u8>,

diff --git a/pip/Cargo.toml b/pip/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
-authors = ["Microsoft"]
 name = "qirrunner"
-version = "0.0.0"
-edition = "2021"
-license = "MIT"
 description = "JIT compiles and executes programs written in QIR (Quantum Intermediate Representation)."
 readme = "README.md"
-homepage = "https://github.com/qir-alliance/qir-runner"
-repository = "https://github.com/qir-alliance/qir-runner"
+version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+license.workspace = true
 
 [dependencies]
 runner = { path = "../runner" }

diff --git a/runner/Cargo.toml b/runner/Cargo.toml
@@ -1,20 +1,18 @@
 [package]
 name = "runner"
-version = "0.7.1"
-edition = "2021"
-license = "MIT"
-
-[dependencies.inkwell]
-git = "https://github.com/TheDan64/inkwell"
-branch = "master"
-default-features = false
-features = ["llvm14-0"]
+version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+license.workspace = true
 
 [dependencies]
 qir-stdlib = { path = "../stdlib" }
 qir-backend = { path = "../backend" }
-clap = { version = "4.5.8", features = [ "cargo" ] }
-msvc_spectre_libs = { version = "0.1", features = ["error"] }
+clap = { workspace = true }
+inkwell = { workspace = true }
+msvc_spectre_libs = { workspace = true }
 
 [[bin]]
 name = "qir-runner"

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
diff --git a/sparsesim/Cargo.toml b/sparsesim/Cargo.toml
@@ -1,14 +1,16 @@
 [package]
 name = "quantum-sparse-sim"
-version = "0.7.1"
-authors = ["Microsoft"]
-edition = "2021"
-license = "MIT"
+version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+license.workspace = true
 
 [dependencies]
-rand = "0.8.5"
-rustc-hash = "1.1.0"
-num-complex = "0.4"
-num-traits = "0.2.19"
-num-bigint = { version = "0.4.6", default-features = false }
-ndarray = "0.15.4"
+rand = { workspace = true }
+rustc-hash = { workspace = true }
+num-complex = { workspace = true }
+num-traits = { workspace = true }
+num-bigint = { workspace = true }
+ndarray = { workspace = true }
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -1,14 +1,16 @@
 [package]
 name = "qir-stdlib"
-version = "0.7.1"
-authors = ["Microsoft"]
-edition = "2021"
-license = "MIT"
 links = "qir-stdlib"
+version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+license.workspace = true
 
 [dependencies]
-num-bigint = { version = "0.4.6", default-features = false }
-rand = "0.8.5"
+num-bigint = { workspace = true }
+rand = { workspace = true }
 
 [lib]
 crate-type = ["staticlib", "rlib"]

diff --git a/stdlib/src/arrays.rs b/stdlib/src/arrays.rs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 use crate::{strings::convert, update_counts};
-use std::{mem::ManuallyDrop, rc::Rc, usize};
+use std::{mem::ManuallyDrop, rc::Rc};
 
 #[cfg(not(feature = "fail-support"))]
 #[allow(improper_ctypes)]
@@ -43,7 +43,7 @@ pub unsafe extern "C" fn __quantum__rt__array_copy(
         let copy = rc.as_ref().clone();
         Rc::into_raw(Rc::new(copy))
     } else {
-        Rc::into_raw(Rc::clone(&rc));
+        let _ = Rc::into_raw(Rc::clone(&rc));
         arr
     }
 }

diff --git a/stdlib/src/callables.rs b/stdlib/src/callables.rs
@@ -111,7 +111,7 @@ pub unsafe extern "C" fn __quantum__rt__callable_copy(
         let copy = rc.as_ref().clone();
         Rc::into_raw(Rc::new(copy))
     } else {
-        Rc::into_raw(Rc::clone(&rc));
+        let _ = Rc::into_raw(Rc::clone(&rc));
         callable
     }
 }

diff --git a/stdlib/src/output_recording.rs b/stdlib/src/output_recording.rs
@@ -45,22 +45,6 @@ impl Read for OutputRecorder {
     }
 }
 
-struct DefaultReaderWriter(Vec<u8>);
-impl Write for DefaultReaderWriter {
-    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        self.0.write(buf)
-    }
-    fn flush(&mut self) -> std::io::Result<()> {
-        self.0.flush()
-    }
-}
-
-impl Read for DefaultReaderWriter {
-    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        self.0.as_slice().read(buf)
-    }
-}
-
 impl Default for OutputRecorder {
     fn default() -> Self {
         OutputRecorder {

diff --git a/stdlib/src/tuples.rs b/stdlib/src/tuples.rs
@@ -5,7 +5,6 @@ use crate::update_counts;
 use std::{
     mem::{size_of, ManuallyDrop},
     rc::Rc,
-    usize,
 };
 
 #[allow(clippy::cast_ptr_alignment)]
@@ -38,7 +37,7 @@ pub unsafe extern "C" fn __quantum__rt__tuple_copy(
         *header = Rc::into_raw(Rc::new(copy));
         header.wrapping_add(1)
     } else {
-        Rc::into_raw(Rc::clone(&rc));
+        let _ = Rc::into_raw(Rc::clone(&rc));
         raw_tup
     }
 }