Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-23 06:46:11 +00:00
Code Issues Activity

Move extern_alloc to skyline

Browse source
This commit is contained in:
jam1garner 2020-04-08 00:31:46 -04:00
parent 02347abf7a
commit 7bc01022f5
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -6,10 +6,6 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "extern_alloc"
version = "0.1.0"
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.1.14" version = "0.1.14"
@ -31,7 +27,7 @@ checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
name = "no_std_test" name = "no_std_test"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"extern_alloc", "skyline",
"tempfile", "tempfile",
] ]
@ -97,6 +93,10 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "skyline"
version = "0.0.1"
[[package]] [[package]]
name = "tempfile" name = "tempfile"
version = "3.1.0" version = "3.1.0"

2
Cargo.toml
View file

@ -10,7 +10,7 @@ crate-type = ["cdylib"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
extern_alloc = { path = "./extern_alloc" } skyline = { path = "./skyline" }
[build-dependencies] [build-dependencies]
tempfile = "3" tempfile = "3"

0
extern_alloc/Cargo.lock → skyline/Cargo.lock generated
View file

4
extern_alloc/Cargo.toml → skyline/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "extern_alloc" name = "skyline"
version = "0.1.0" version = "0.0.1"
authors = ["jam1garner <jam1.mcleod@hotmail.com>"] authors = ["jam1garner <jam1.mcleod@hotmail.com>"]
edition = "2018" edition = "2018"

0
extern_alloc/src/lib.rs → skyline/src/lib.rs
View file

2
src/lib.rs
View file

@ -3,7 +3,7 @@
#![feature(lang_items, start, global_asm, const_generics, impl_trait_in_bindings)] #![feature(lang_items, start, global_asm, const_generics, impl_trait_in_bindings)]
use core::any::Any; use core::any::Any;
use extern_alloc::Allocator; use skyline::Allocator;
#[global_allocator] #[global_allocator]
pub static ALLOCATOR: Allocator = Allocator; pub static ALLOCATOR: Allocator = Allocator;