From 7bc01022f57801399f6ae5f1aac6902758790705 Mon Sep 17 00:00:00 2001 From: jam1garner Date: Wed, 8 Apr 2020 00:31:46 -0400 Subject: [PATCH] Move extern_alloc to skyline --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- {extern_alloc => skyline}/Cargo.lock | 0 {extern_alloc => skyline}/Cargo.toml | 4 ++-- {extern_alloc => skyline}/src/lib.rs | 0 src/lib.rs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename {extern_alloc => skyline}/Cargo.lock (100%) rename {extern_alloc => skyline}/Cargo.toml (82%) rename {extern_alloc => skyline}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 66f45ed..8645bea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,10 +6,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -[[package]] -name = "extern_alloc" -version = "0.1.0" - [[package]] name = "getrandom" version = "0.1.14" @@ -31,7 +27,7 @@ checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" name = "no_std_test" version = "0.1.0" dependencies = [ - "extern_alloc", + "skyline", "tempfile", ] @@ -97,6 +93,10 @@ dependencies = [ "winapi", ] +[[package]] +name = "skyline" +version = "0.0.1" + [[package]] name = "tempfile" version = "3.1.0" diff --git a/Cargo.toml b/Cargo.toml index b0a3ed6..4bfb722 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -extern_alloc = { path = "./extern_alloc" } +skyline = { path = "./skyline" } [build-dependencies] tempfile = "3" diff --git a/extern_alloc/Cargo.lock b/skyline/Cargo.lock similarity index 100% rename from extern_alloc/Cargo.lock rename to skyline/Cargo.lock diff --git a/extern_alloc/Cargo.toml b/skyline/Cargo.toml similarity index 82% rename from extern_alloc/Cargo.toml rename to skyline/Cargo.toml index 231b201..52d6f0f 100644 --- a/extern_alloc/Cargo.toml +++ b/skyline/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "extern_alloc" -version = "0.1.0" +name = "skyline" +version = "0.0.1" authors = ["jam1garner "] edition = "2018" diff --git a/extern_alloc/src/lib.rs b/skyline/src/lib.rs similarity index 100% rename from extern_alloc/src/lib.rs rename to skyline/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index 7a03ab9..1f3e53d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,7 +3,7 @@ #![feature(lang_items, start, global_asm, const_generics, impl_trait_in_bindings)] use core::any::Any; -use extern_alloc::Allocator; +use skyline::Allocator; #[global_allocator] pub static ALLOCATOR: Allocator = Allocator;