From aab7ac67c3a746168b9346f46f87608d7a3abd74 Mon Sep 17 00:00:00 2001 From: Mark Poliakov Date: Tue, 12 Mar 2024 12:45:31 +0200 Subject: [PATCH] Rename to abi-generator --- Cargo.lock | 42 +++++++++++------------ Cargo.toml | 4 +-- {handler => abi-kernel-macros}/Cargo.toml | 4 +-- {handler => abi-kernel-macros}/src/lib.rs | 10 +++--- example-abi/Cargo.toml | 2 +- example-abi/build.rs | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) rename {handler => abi-kernel-macros}/Cargo.toml (75%) rename {handler => abi-kernel-macros}/src/lib.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index bfc6ff25..4e29cec6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,26 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "abi-generator" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "thiserror", +] + +[[package]] +name = "abi-kernel-macros" +version = "0.1.0" +dependencies = [ + "abi-generator", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "abi-lib" version = "0.1.0" @@ -23,19 +43,9 @@ dependencies = [ name = "example-abi" version = "0.1.0" dependencies = [ + "abi-generator", "abi-lib", "prettyplease", - "syscall-generator", -] - -[[package]] -name = "handler" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "syscall-generator", ] [[package]] @@ -83,16 +93,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "syscall-generator" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "thiserror", -] - [[package]] name = "thiserror" version = "1.0.57" diff --git a/Cargo.toml b/Cargo.toml index e1a577e9..3cd882ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "syscall-generator" +name = "abi-generator" version = "0.1.0" edition = "2021" @@ -10,4 +10,4 @@ syn = { version = "2.0.32", features = ["full"] } thiserror = "1.0.47" [workspace] -members = [ "abi-lib","example-abi", "handler"] +members = ["abi-lib", "example-abi", "abi-kernel-macros"] diff --git a/handler/Cargo.toml b/abi-kernel-macros/Cargo.toml similarity index 75% rename from handler/Cargo.toml rename to abi-kernel-macros/Cargo.toml index 73e40651..4538d8e9 100644 --- a/handler/Cargo.toml +++ b/abi-kernel-macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "handler" +name = "abi-kernel-macros" version = "0.1.0" edition = "2021" @@ -8,7 +8,7 @@ proc-macro2 = "1.0.78" quote = "1.0.35" syn = { version = "2.0.52", features = ["full"] } -syscall-generator = { path = ".." } +abi-generator = { path = ".." } [lib] proc-macro = true diff --git a/handler/src/lib.rs b/abi-kernel-macros/src/lib.rs similarity index 99% rename from handler/src/lib.rs rename to abi-kernel-macros/src/lib.rs index 99acebe5..fb9b30c8 100644 --- a/handler/src/lib.rs +++ b/abi-kernel-macros/src/lib.rs @@ -1,12 +1,12 @@ -use proc_macro::TokenStream as TokenStream1; -use proc_macro2::Span; -use quote::quote; -use syn::{parse_macro_input, punctuated::Punctuated, Token}; -use syscall_generator::{ +use abi_generator::{ abi::{ty::TypeWidth, Abi}, syntax::UnwrapFancy, TargetEnv, }; +use proc_macro::TokenStream as TokenStream1; +use proc_macro2::Span; +use quote::quote; +use syn::{parse_macro_input, punctuated::Punctuated, Token}; enum DispatcherAbiPath { Env(syn::LitStr), diff --git a/example-abi/Cargo.toml b/example-abi/Cargo.toml index f6100b26..fd163c29 100644 --- a/example-abi/Cargo.toml +++ b/example-abi/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" abi-lib = { path = "../abi-lib" } [build-dependencies] -syscall-generator = { path = ".." } +abi-generator = { path = ".." } prettyplease = "0.2.15" diff --git a/example-abi/build.rs b/example-abi/build.rs index 435993dd..1f11464d 100644 --- a/example-abi/build.rs +++ b/example-abi/build.rs @@ -1,6 +1,6 @@ use std::{env, path::Path}; -use syscall_generator::{ +use abi_generator::{ abi::{ty::TypeWidth, AbiBuilder}, syntax::UnwrapFancy, TargetEnv,