Skip to content

Commit 8b8d018

Browse files
committed
Revert "Relocate 'api_identity' derive macro - it's a helper for omicron-common (#288)"
This reverts commit ec737d3.
1 parent e74a8b8 commit 8b8d018

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed
File renamed without changes.
File renamed without changes.

common/src/api/external/api_identity/src/lib.rs renamed to api_identity/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ fn do_object_identity(item: TokenStream) -> Result<TokenStream, syn::Error> {
4343
};
4444

4545
let stream = quote! {
46-
impl crate::api::external::ObjectIdentity for #name {
47-
fn identity(&self) -> &crate::api::external::IdentityMetadata {
46+
impl ObjectIdentity for #name {
47+
fn identity(&self) -> &IdentityMetadata {
4848
&self.identity
4949
}
5050
}
@@ -68,8 +68,8 @@ mod test {
6868
);
6969

7070
let expected = quote! {
71-
impl crate::api::external::ObjectIdentity for Foo {
72-
fn identity(&self) -> &crate::api::external::IdentityMetadata {
71+
impl ObjectIdentity for Foo {
72+
fn identity(&self) -> &IdentityMetadata {
7373
&self.identity
7474
}
7575
}

common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
2727
percent-encoding = "2.1.0"
2828

2929
[dependencies.api_identity]
30-
path = "src/api/external/api_identity"
30+
path = "../api_identity"
3131

3232
[dependencies.backoff]
3333
version = "0.3.0"

0 commit comments

Comments
 (0)