From 71763deb61745972f2fc700ca7264c99e2838754 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 20 Apr 2024 14:32:37 +0200
Subject: Reference local packages by their actual names

---
 crates/rebel-runner/Cargo.toml       | 2 +-
 crates/rebel-runner/src/init.rs      | 2 +-
 crates/rebel-runner/src/jobserver.rs | 2 +-
 crates/rebel-runner/src/lib.rs       | 2 +-
 crates/rebel-runner/src/ns.rs        | 2 +-
 crates/rebel-runner/src/paths.rs     | 2 +-
 crates/rebel-runner/src/tar.rs       | 2 +-
 crates/rebel-runner/src/task.rs      | 2 +-
 crates/rebel-runner/src/util/fs.rs   | 2 +-
 crates/rebel-runner/src/util/unix.rs | 2 +-
 crates/rebel/Cargo.toml              | 4 ++--
 crates/rebel/src/context.rs          | 2 +-
 crates/rebel/src/driver.rs           | 4 ++--
 crates/rebel/src/main.rs             | 2 +-
 crates/rebel/src/pin.rs              | 2 +-
 crates/rebel/src/recipe.rs           | 2 +-
 crates/rebel/src/resolve.rs          | 2 +-
 crates/rebel/src/task.rs             | 2 +-
 crates/rebel/src/template.rs         | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/crates/rebel-runner/Cargo.toml b/crates/rebel-runner/Cargo.toml
index 076e47a..3df06f8 100644
--- a/crates/rebel-runner/Cargo.toml
+++ b/crates/rebel-runner/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-common = { path = "../rebel-common", package = "rebel-common" }
+rebel-common = { path = "../rebel-common" }
 
 bincode = "1.3.3"
 blake3 = { version = "1.3.0", features = ["traits-preview"] }
diff --git a/crates/rebel-runner/src/init.rs b/crates/rebel-runner/src/init.rs
index ede8fd8..0172a01 100644
--- a/crates/rebel-runner/src/init.rs
+++ b/crates/rebel-runner/src/init.rs
@@ -1,6 +1,6 @@
 use nix::mount::{self, MsFlags};
 
-use common::error::*;
+use rebel_common::error::*;
 
 use crate::{paths, util::fs};
 
diff --git a/crates/rebel-runner/src/jobserver.rs b/crates/rebel-runner/src/jobserver.rs
index b0b88cd..7c3f2f7 100644
--- a/crates/rebel-runner/src/jobserver.rs
+++ b/crates/rebel-runner/src/jobserver.rs
@@ -5,7 +5,7 @@ use std::{
 
 use nix::{errno::Errno, fcntl::OFlag, poll, unistd};
 
-use common::error::*;
+use rebel_common::error::*;
 
 use super::util::unix;
 
diff --git a/crates/rebel-runner/src/lib.rs b/crates/rebel-runner/src/lib.rs
index ab90420..7dde05d 100644
--- a/crates/rebel-runner/src/lib.rs
+++ b/crates/rebel-runner/src/lib.rs
@@ -29,7 +29,7 @@ use nix::{
 };
 use uds::UnixSeqpacketConn;
 
-use common::{error::*, types::*};
+use rebel_common::{error::*, types::*};
 
 use jobserver::Jobserver;
 use util::{checkable::Checkable, clone, steal::Steal, unix};
diff --git a/crates/rebel-runner/src/ns.rs b/crates/rebel-runner/src/ns.rs
index 4a8e3e7..986aa80 100644
--- a/crates/rebel-runner/src/ns.rs
+++ b/crates/rebel-runner/src/ns.rs
@@ -4,7 +4,7 @@ use nix::{
 	unistd::{self, Gid, Pid, Uid},
 };
 
-use common::error::*;
+use rebel_common::error::*;
 
 use super::util::clone;
 
diff --git a/crates/rebel-runner/src/paths.rs b/crates/rebel-runner/src/paths.rs
index 4b3a126..84f9c4d 100644
--- a/crates/rebel-runner/src/paths.rs
+++ b/crates/rebel-runner/src/paths.rs
@@ -36,7 +36,7 @@
 //!             └── rootfs/           # rootfs overlay mountpoint
 //! ```
 
-use common::string_hash::*;
+use rebel_common::string_hash::*;
 
 pub const DOWNLOADS_DIR: &str = "build/downloads";
 pub const PIN_DIR: &str = "build/pinned";
diff --git a/crates/rebel-runner/src/tar.rs b/crates/rebel-runner/src/tar.rs
index 1a66408..891c603 100644
--- a/crates/rebel-runner/src/tar.rs
+++ b/crates/rebel-runner/src/tar.rs
@@ -11,7 +11,7 @@ use nix::{
 	sys::wait,
 };
 
-use common::{error::*, string_hash::ArchiveHash};
+use rebel_common::{error::*, string_hash::ArchiveHash};
 
 use super::{
 	ns,
diff --git a/crates/rebel-runner/src/task.rs b/crates/rebel-runner/src/task.rs
index 19b74f4..5bb253a 100644
--- a/crates/rebel-runner/src/task.rs
+++ b/crates/rebel-runner/src/task.rs
@@ -17,7 +17,7 @@ use nix::{
 use serde::Serialize;
 use tee_readwrite::{TeeReader, TeeWriter};
 
-use common::{error::*, string_hash::*, types::*};
+use rebel_common::{error::*, string_hash::*, types::*};
 use walkdir::WalkDir;
 
 use super::{
diff --git a/crates/rebel-runner/src/util/fs.rs b/crates/rebel-runner/src/util/fs.rs
index 5efd159..9e33eb7 100644
--- a/crates/rebel-runner/src/util/fs.rs
+++ b/crates/rebel-runner/src/util/fs.rs
@@ -11,7 +11,7 @@ use nix::{
 	unistd,
 };
 
-use common::error::*;
+use rebel_common::error::*;
 
 pub fn open<P: AsRef<Path>>(path: P) -> Result<fs::File> {
 	fs::File::open(path.as_ref())
diff --git a/crates/rebel-runner/src/util/unix.rs b/crates/rebel-runner/src/util/unix.rs
index 08884ec..a97b1db 100644
--- a/crates/rebel-runner/src/util/unix.rs
+++ b/crates/rebel-runner/src/util/unix.rs
@@ -6,7 +6,7 @@ use nix::{
 	unistd::Pid,
 };
 
-use common::error::*;
+use rebel_common::error::*;
 
 use super::fs;
 
diff --git a/crates/rebel/Cargo.toml b/crates/rebel/Cargo.toml
index 7164ca6..9d5c498 100644
--- a/crates/rebel/Cargo.toml
+++ b/crates/rebel/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-common = { path = "../rebel-common", package = "rebel-common" }
-runner = { path = "../rebel-runner", package = "rebel-runner" }
+rebel-common = { path = "../rebel-common" }
+rebel-runner = { path = "../rebel-runner" }
 
 clap = { version = "4.0.0", features = ["derive"] }
 deb-version = "0.1.1"
diff --git a/crates/rebel/src/context.rs b/crates/rebel/src/context.rs
index be98813..084facd 100644
--- a/crates/rebel/src/context.rs
+++ b/crates/rebel/src/context.rs
@@ -9,7 +9,7 @@ use std::{
 	result,
 };
 
-use common::{
+use rebel_common::{
 	error::{self, Contextualizable},
 	string_hash::ArchiveHash,
 	types::TaskID,
diff --git a/crates/rebel/src/driver.rs b/crates/rebel/src/driver.rs
index b2655c6..61ac06e 100644
--- a/crates/rebel/src/driver.rs
+++ b/crates/rebel/src/driver.rs
@@ -13,8 +13,8 @@ use nix::{
 	},
 };
 
-use common::{error::*, string_hash::*, types::*};
-use runner::Runner;
+use rebel_common::{error::*, string_hash::*, types::*};
+use rebel_runner::Runner;
 
 use crate::{
 	context::{Context, OutputRef, TaskRef},
diff --git a/crates/rebel/src/main.rs b/crates/rebel/src/main.rs
index bd08f18..54ea1cf 100644
--- a/crates/rebel/src/main.rs
+++ b/crates/rebel/src/main.rs
@@ -13,7 +13,7 @@ use std::collections::HashSet;
 
 use clap::Parser;
 
-use runner::Runner;
+use rebel_runner::{self as runner, Runner};
 
 #[derive(Parser)]
 #[clap(version, about)]
diff --git a/crates/rebel/src/pin.rs b/crates/rebel/src/pin.rs
index 26e445c..bb98e2e 100644
--- a/crates/rebel/src/pin.rs
+++ b/crates/rebel/src/pin.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, fs::File, path::Path};
 
 use serde::{Deserialize, Serialize};
 
-use common::{error::*, string_hash::*};
+use rebel_common::{error::*, string_hash::*};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Args {
diff --git a/crates/rebel/src/recipe.rs b/crates/rebel/src/recipe.rs
index 16d3751..fd5367a 100644
--- a/crates/rebel/src/recipe.rs
+++ b/crates/rebel/src/recipe.rs
@@ -4,7 +4,7 @@ use scoped_tls_hkt::scoped_thread_local;
 use serde::{de::DeserializeOwned, Deserialize, Deserializer};
 use walkdir::WalkDir;
 
-use common::{error::*, types::*};
+use rebel_common::{error::*, types::*};
 
 use crate::task::{TaskDef, TaskMeta};
 
diff --git a/crates/rebel/src/resolve.rs b/crates/rebel/src/resolve.rs
index 102c483..896903f 100644
--- a/crates/rebel/src/resolve.rs
+++ b/crates/rebel/src/resolve.rs
@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::rc::Rc;
 
-use common::types::TaskID;
+use rebel_common::types::TaskID;
 
 use crate::args::TaskArgs;
 use crate::context::{self, Context, OutputRef, TaskRef};
diff --git a/crates/rebel/src/task.rs b/crates/rebel/src/task.rs
index e84766e..7875869 100644
--- a/crates/rebel/src/task.rs
+++ b/crates/rebel/src/task.rs
@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 
 use serde::Deserialize;
 
-use common::{string_hash::StringHash, types::TaskID};
+use rebel_common::{string_hash::StringHash, types::TaskID};
 
 use crate::{
 	args::{ArgMapping, ArgType, TaskArgs},
diff --git a/crates/rebel/src/template.rs b/crates/rebel/src/template.rs
index 1a091ed..7c30508 100644
--- a/crates/rebel/src/template.rs
+++ b/crates/rebel/src/template.rs
@@ -1,7 +1,7 @@
 use handlebars::Handlebars;
 use lazy_static::lazy_static;
 
-use common::error::*;
+use rebel_common::error::*;
 
 use crate::args::TaskArgs;
 
-- 
cgit v1.2.3