From f0297012c6f023ce765074239e9fb01ecef7b32f Mon Sep 17 00:00:00 2001 From: Armani Ferrante Date: Sat, 30 Jan 2021 05:14:45 -0800 Subject: [PATCH] Create lang dir --- Cargo.toml | 31 +++---------------- cli/Cargo.toml | 4 +-- client/Cargo.toml | 2 +- lang/Cargo.toml | 23 ++++++++++++++ .../attribute}/access-control/Cargo.toml | 0 .../attribute}/access-control/src/lib.rs | 0 .../attribute}/account/Cargo.toml | 0 .../attribute}/account/src/lib.rs | 0 .../attribute}/error/Cargo.toml | 0 .../attribute}/error/src/lib.rs | 0 .../attribute}/program/Cargo.toml | 0 .../attribute}/program/src/lib.rs | 0 .../attribute}/state/Cargo.toml | 0 .../attribute}/state/src/lib.rs | 0 {derive => lang/derive}/accounts/Cargo.toml | 0 {derive => lang/derive}/accounts/src/lib.rs | 0 {src => lang/src}/account_info.rs | 0 {src => lang/src}/boxed.rs | 0 {src => lang/src}/context.rs | 0 {src => lang/src}/cpi_account.rs | 0 {src => lang/src}/ctor.rs | 0 {src => lang/src}/error.rs | 0 {src => lang/src}/idl.rs | 0 {src => lang/src}/lib.rs | 0 {src => lang/src}/program_account.rs | 0 {src => lang/src}/state.rs | 0 {src => lang/src}/sysvar.rs | 0 {syn => lang/syn}/Cargo.toml | 0 {syn => lang/syn}/src/codegen/accounts.rs | 1 - {syn => lang/syn}/src/codegen/error.rs | 0 {syn => lang/syn}/src/codegen/mod.rs | 0 {syn => lang/syn}/src/codegen/program.rs | 0 {syn => lang/syn}/src/idl.rs | 0 {syn => lang/syn}/src/lib.rs | 0 {syn => lang/syn}/src/parser/accounts.rs | 0 {syn => lang/syn}/src/parser/error.rs | 0 {syn => lang/syn}/src/parser/file.rs | 0 {syn => lang/syn}/src/parser/mod.rs | 0 {syn => lang/syn}/src/parser/program.rs | 0 spl/Cargo.toml | 2 +- 40 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 lang/Cargo.toml rename {attribute => lang/attribute}/access-control/Cargo.toml (100%) rename {attribute => lang/attribute}/access-control/src/lib.rs (100%) rename {attribute => lang/attribute}/account/Cargo.toml (100%) rename {attribute => lang/attribute}/account/src/lib.rs (100%) rename {attribute => lang/attribute}/error/Cargo.toml (100%) rename {attribute => lang/attribute}/error/src/lib.rs (100%) rename {attribute => lang/attribute}/program/Cargo.toml (100%) rename {attribute => lang/attribute}/program/src/lib.rs (100%) rename {attribute => lang/attribute}/state/Cargo.toml (100%) rename {attribute => lang/attribute}/state/src/lib.rs (100%) rename {derive => lang/derive}/accounts/Cargo.toml (100%) rename {derive => lang/derive}/accounts/src/lib.rs (100%) rename {src => lang/src}/account_info.rs (100%) rename {src => lang/src}/boxed.rs (100%) rename {src => lang/src}/context.rs (100%) rename {src => lang/src}/cpi_account.rs (100%) rename {src => lang/src}/ctor.rs (100%) rename {src => lang/src}/error.rs (100%) rename {src => lang/src}/idl.rs (100%) rename {src => lang/src}/lib.rs (100%) rename {src => lang/src}/program_account.rs (100%) rename {src => lang/src}/state.rs (100%) rename {src => lang/src}/sysvar.rs (100%) rename {syn => lang/syn}/Cargo.toml (100%) rename {syn => lang/syn}/src/codegen/accounts.rs (99%) rename {syn => lang/syn}/src/codegen/error.rs (100%) rename {syn => lang/syn}/src/codegen/mod.rs (100%) rename {syn => lang/syn}/src/codegen/program.rs (100%) rename {syn => lang/syn}/src/idl.rs (100%) rename {syn => lang/syn}/src/lib.rs (100%) rename {syn => lang/syn}/src/parser/accounts.rs (100%) rename {syn => lang/syn}/src/parser/error.rs (100%) rename {syn => lang/syn}/src/parser/file.rs (100%) rename {syn => lang/syn}/src/parser/mod.rs (100%) rename {syn => lang/syn}/src/parser/program.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index a67f6bd26..cfeea8465 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,33 +1,10 @@ -[package] -name = "anchor-lang" -version = "0.0.0-alpha.0" -authors = ["Serum Foundation "] -repository = "https://github.com/project-serum/anchor" -edition = "2018" -license = "Apache-2.0" -description = "Solana Sealevel eDSL" - -[features] -derive = [] -default = [] - -[dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.0.0-alpha.0" } -anchor-attribute-account = { path = "./attribute/account", version = "0.0.0-alpha.0" } -anchor-attribute-error = { path = "./attribute/error" } -anchor-attribute-program = { path = "./attribute/program", version = "0.0.0-alpha.0" } -anchor-attribute-state = { path = "./attribute/state", version = "0.0.0-alpha.0" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.0.0-alpha.0" } -serum-borsh = { version = "0.8.0-serum.1", features = ["serum-program"] } -solana-program = "=1.5.0" -thiserror = "1.0.20" - [workspace] members = [ "cli", "client", - "syn", - "attribute/*", - "derive/*", + "lang", + "lang/attribute/*", + "lang/derive/*", + "lang/syn", "spl", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 2fb0c9d74..b004c478f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -12,8 +12,8 @@ path = "src/main.rs" clap = "3.0.0-beta.1" anyhow = "1.0.32" syn = { version = "1.0.54", features = ["full", "extra-traits"] } -anchor-lang = { path = "../" } -anchor-syn = { path = "../syn", features = ["idl"] } +anchor-lang = { path = "../lang" } +anchor-syn = { path = "../lang/syn", features = ["idl"] } serde_json = "1.0" shellexpand = "2.1.0" serde_yaml = "0.8" diff --git a/client/Cargo.toml b/client/Cargo.toml index 9d7105c04..70b05fda3 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Armani Ferrante "] edition = "2018" [dependencies] -anchor-lang = { path = "../" } +anchor-lang = { path = "../lang" } solana-client = "1.5.0" solana-sdk = "1.5.0" thiserror = "1.0.20" \ No newline at end of file diff --git a/lang/Cargo.toml b/lang/Cargo.toml new file mode 100644 index 000000000..211042776 --- /dev/null +++ b/lang/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "anchor-lang" +version = "0.0.0-alpha.0" +authors = ["Serum Foundation "] +repository = "https://github.com/project-serum/anchor" +edition = "2018" +license = "Apache-2.0" +description = "Solana Sealevel eDSL" + +[features] +derive = [] +default = [] + +[dependencies] +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.0.0-alpha.0" } +anchor-attribute-account = { path = "./attribute/account", version = "0.0.0-alpha.0" } +anchor-attribute-error = { path = "./attribute/error" } +anchor-attribute-program = { path = "./attribute/program", version = "0.0.0-alpha.0" } +anchor-attribute-state = { path = "./attribute/state", version = "0.0.0-alpha.0" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.0.0-alpha.0" } +serum-borsh = { version = "0.8.0-serum.1", features = ["serum-program"] } +solana-program = "=1.5.0" +thiserror = "1.0.20" \ No newline at end of file diff --git a/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml similarity index 100% rename from attribute/access-control/Cargo.toml rename to lang/attribute/access-control/Cargo.toml diff --git a/attribute/access-control/src/lib.rs b/lang/attribute/access-control/src/lib.rs similarity index 100% rename from attribute/access-control/src/lib.rs rename to lang/attribute/access-control/src/lib.rs diff --git a/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml similarity index 100% rename from attribute/account/Cargo.toml rename to lang/attribute/account/Cargo.toml diff --git a/attribute/account/src/lib.rs b/lang/attribute/account/src/lib.rs similarity index 100% rename from attribute/account/src/lib.rs rename to lang/attribute/account/src/lib.rs diff --git a/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml similarity index 100% rename from attribute/error/Cargo.toml rename to lang/attribute/error/Cargo.toml diff --git a/attribute/error/src/lib.rs b/lang/attribute/error/src/lib.rs similarity index 100% rename from attribute/error/src/lib.rs rename to lang/attribute/error/src/lib.rs diff --git a/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml similarity index 100% rename from attribute/program/Cargo.toml rename to lang/attribute/program/Cargo.toml diff --git a/attribute/program/src/lib.rs b/lang/attribute/program/src/lib.rs similarity index 100% rename from attribute/program/src/lib.rs rename to lang/attribute/program/src/lib.rs diff --git a/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml similarity index 100% rename from attribute/state/Cargo.toml rename to lang/attribute/state/Cargo.toml diff --git a/attribute/state/src/lib.rs b/lang/attribute/state/src/lib.rs similarity index 100% rename from attribute/state/src/lib.rs rename to lang/attribute/state/src/lib.rs diff --git a/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml similarity index 100% rename from derive/accounts/Cargo.toml rename to lang/derive/accounts/Cargo.toml diff --git a/derive/accounts/src/lib.rs b/lang/derive/accounts/src/lib.rs similarity index 100% rename from derive/accounts/src/lib.rs rename to lang/derive/accounts/src/lib.rs diff --git a/src/account_info.rs b/lang/src/account_info.rs similarity index 100% rename from src/account_info.rs rename to lang/src/account_info.rs diff --git a/src/boxed.rs b/lang/src/boxed.rs similarity index 100% rename from src/boxed.rs rename to lang/src/boxed.rs diff --git a/src/context.rs b/lang/src/context.rs similarity index 100% rename from src/context.rs rename to lang/src/context.rs diff --git a/src/cpi_account.rs b/lang/src/cpi_account.rs similarity index 100% rename from src/cpi_account.rs rename to lang/src/cpi_account.rs diff --git a/src/ctor.rs b/lang/src/ctor.rs similarity index 100% rename from src/ctor.rs rename to lang/src/ctor.rs diff --git a/src/error.rs b/lang/src/error.rs similarity index 100% rename from src/error.rs rename to lang/src/error.rs diff --git a/src/idl.rs b/lang/src/idl.rs similarity index 100% rename from src/idl.rs rename to lang/src/idl.rs diff --git a/src/lib.rs b/lang/src/lib.rs similarity index 100% rename from src/lib.rs rename to lang/src/lib.rs diff --git a/src/program_account.rs b/lang/src/program_account.rs similarity index 100% rename from src/program_account.rs rename to lang/src/program_account.rs diff --git a/src/state.rs b/lang/src/state.rs similarity index 100% rename from src/state.rs rename to lang/src/state.rs diff --git a/src/sysvar.rs b/lang/src/sysvar.rs similarity index 100% rename from src/sysvar.rs rename to lang/src/sysvar.rs diff --git a/syn/Cargo.toml b/lang/syn/Cargo.toml similarity index 100% rename from syn/Cargo.toml rename to lang/syn/Cargo.toml diff --git a/syn/src/codegen/accounts.rs b/lang/syn/src/codegen/accounts.rs similarity index 99% rename from syn/src/codegen/accounts.rs rename to lang/syn/src/codegen/accounts.rs index 3fccb10f5..a9e7608c8 100644 --- a/syn/src/codegen/accounts.rs +++ b/lang/syn/src/codegen/accounts.rs @@ -230,7 +230,6 @@ pub fn generate(accs: AccountsStruct) -> proc_macro2::TokenStream { }; quote! { - mod #account_mod_name { use super::*; use anchor_lang::prelude::borsh; diff --git a/syn/src/codegen/error.rs b/lang/syn/src/codegen/error.rs similarity index 100% rename from syn/src/codegen/error.rs rename to lang/syn/src/codegen/error.rs diff --git a/syn/src/codegen/mod.rs b/lang/syn/src/codegen/mod.rs similarity index 100% rename from syn/src/codegen/mod.rs rename to lang/syn/src/codegen/mod.rs diff --git a/syn/src/codegen/program.rs b/lang/syn/src/codegen/program.rs similarity index 100% rename from syn/src/codegen/program.rs rename to lang/syn/src/codegen/program.rs diff --git a/syn/src/idl.rs b/lang/syn/src/idl.rs similarity index 100% rename from syn/src/idl.rs rename to lang/syn/src/idl.rs diff --git a/syn/src/lib.rs b/lang/syn/src/lib.rs similarity index 100% rename from syn/src/lib.rs rename to lang/syn/src/lib.rs diff --git a/syn/src/parser/accounts.rs b/lang/syn/src/parser/accounts.rs similarity index 100% rename from syn/src/parser/accounts.rs rename to lang/syn/src/parser/accounts.rs diff --git a/syn/src/parser/error.rs b/lang/syn/src/parser/error.rs similarity index 100% rename from syn/src/parser/error.rs rename to lang/syn/src/parser/error.rs diff --git a/syn/src/parser/file.rs b/lang/syn/src/parser/file.rs similarity index 100% rename from syn/src/parser/file.rs rename to lang/syn/src/parser/file.rs diff --git a/syn/src/parser/mod.rs b/lang/syn/src/parser/mod.rs similarity index 100% rename from syn/src/parser/mod.rs rename to lang/syn/src/parser/mod.rs diff --git a/syn/src/parser/program.rs b/lang/syn/src/parser/program.rs similarity index 100% rename from syn/src/parser/program.rs rename to lang/syn/src/parser/program.rs diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 0c9abb52d..96b71439d 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -5,5 +5,5 @@ authors = ["Armani Ferrante "] edition = "2018" [dependencies] -anchor-lang = { path = "../", features = ["derive"] } +anchor-lang = { path = "../lang", features = ["derive"] } spl-token = { version = "3.0.1", features = ["no-entrypoint"] }