Skip to content

Commit ec0b1e9

Browse files
committed
Relocated for merge.
1 parent 9ccb725 commit ec0b1e9

13 files changed

Lines changed: 5 additions & 127 deletions

File tree

.cirrus.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.gitmodules

Lines changed: 0 additions & 4 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 103 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

Cargo.toml renamed to snmalloc-rs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "rust bindings of snmalloc."
88
keywords = ["snmalloc", "allocator"]
99
categories = ["memory-management", "api-bindings"]
1010
homepage = "https://github.com/microsoft/snmalloc"
11-
repository = "https://github.com/SchrodingerZhu/snmalloc-rs"
11+
repository = "https://github.com/microsoft/snmalloc"
1212
readme = "README.md"
1313
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1414

File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "rust raw bindings of snmalloc."
88
keywords = ["snmalloc", "allocator"]
99
categories = ["memory-management", "api-bindings"]
1010
homepage = "https://github.com/microsoft/snmalloc"
11-
repository = "https://github.com/SchrodingerZhu/snmalloc-rs"
11+
repository = "https://github.com/microsoft/snmalloc"
1212
build = "build.rs"
1313
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1414

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl BuildConfig {
7070
let builder = cc::Build::new();
7171

7272
#[cfg(not(feature = "build_cc"))]
73-
let builder = Config::new("snmalloc");
73+
let builder = Config::new("../..");
7474

7575
let mut config = Self {
7676
debug,
@@ -226,8 +226,8 @@ impl BuilderDefine for cc::Build {
226226
}
227227

228228
fn configure_cpp(&mut self, debug: bool) -> &mut Self {
229-
self.include("snmalloc/src")
230-
.file("snmalloc/src/snmalloc/override/rust.cc")
229+
self.include("../../src")
230+
.file("../../src/snmalloc/override/rust.cc")
231231
.cpp(true)
232232
.debug(debug)
233233
.static_crt(true)

0 commit comments

Comments
 (0)