Move pkg to testsuite/utils

Author: smoelius

tests/testsuite/install.rs

@@ -8,7 +8,7 @@ use std::path::PathBuf;
 use std::thread;
 
 use crate::prelude::*;
-use crate::utils::cargo_process;
+use crate::utils::{cargo_process, pkg};
 use cargo_test_support::compare::assert_e2e;
 use cargo_test_support::cross_compile;
 use cargo_test_support::git;
@@ -21,16 +21,6 @@ use crate::utils::cross_compile::disabled as cross_compile_disabled;
 use cargo_test_support::install::{assert_has_installed_exe, assert_has_not_installed_exe, exe};
 use cargo_test_support::paths;
 
-fn pkg(name: &str, vers: &str) {
-    Package::new(name, vers)
-        .file("src/lib.rs", "")
-        .file(
-            "src/main.rs",
-            &format!("extern crate {}; fn main() {{}}", name),
-        )
-        .publish();
-}
-
 #[cargo_test]
 fn simple() {
     pkg("foo", "0.0.1");

tests/testsuite/utils/mod.rs

@@ -1,5 +1,6 @@
 use std::path::PathBuf;
 
+use cargo_test_support::registry::Package;
 use cargo_test_support::{ArgLineCommandExt, Execs, execs, process};
 
 pub mod cross_compile;
@@ -19,3 +20,13 @@ pub fn cargo_process(arg_line: &str) -> Execs {
 pub fn cargo_exe() -> PathBuf {
     snapbox::cmd::cargo_bin!("cargo").to_path_buf()
 }
+
+pub fn pkg(name: &str, vers: &str) {
+    Package::new(name, vers)
+        .file("src/lib.rs", "")
+        .file(
+            "src/main.rs",
+            &format!("extern crate {}; fn main() {{}}", name),
+        )
+        .publish();
+}