aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml39
-rw-r--r--Android.bp6
-rw-r--r--METADATA14
-rw-r--r--TEST_MAPPING1
4 files changed, 50 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..bc2955e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,39 @@
+language: rust
+matrix:
+ include:
+ - rust: nightly
+ - rust: stable
+ env: RUSTFMT=1
+
+ # Minimum supported Rust version
+ - rust: 1.6.0
+ script:
+ - cargo build
+
+before_script:
+ - if [ "$RUSTFMT" = 1 ]; then rustup component add rustfmt; fi
+
+script:
+ - if [ "$RUSTFMT" = 1 ]; then cargo fmt -- --check; fi
+ - cargo test
+ - cargo doc --no-deps
+
+# Deploy documentation to S3 for specific branches. At some
+# point, it would be nice to also support building docs for
+# a specific tag
+deploy:
+ provider: s3
+ access_key_id: AKIAIXM3KLI7WZS4ZA3Q
+ secret_access_key:
+ secure: WyYzM8PxSKC3HQ+jINE50KOu5j3taOA4chJJ9zfAhM8Eug/Z1bK8taHnm73xrCUsvh4bv1C3XWAnSTl4YO/HykYulTIVPPs6go+ssk/59PDV6dGPhheLj2tKcSrjKd4q8H668MAPiAlNt9Rvq/GkkdAW2GXG1+otPMVFBrnR+kld6WaX5EB18SjApKgl5NwSRj9wiSIPYJTBnZQhCsaM4YRMkpFbFoHUWjSjm7N9f/6A3a3jRzW7/ZtqXvMaMazMSBAlN0/LH2UMTKCuj7nywKJt1NkpEF8mA9IEUCDBCnQs+e58v6BpkDZ2nhCJ7vdm0bISuZB6jXhg+sOycZbdb7mbn5n4mPBMa1c8WnsfmVxm7bV7G3sRpcGU8HvRT35lCCuCt4bFBX1O2abuTtVqS7XgtyChBmrSG6I/z+lw+u44Dk5bYK9A2hZSOEPFr09R8f2YRe9cqAq+uI6rNPyY7DC0eATCRCX5CxjYR6DG2bDoDFfPsBlRLQJJUl/BOM5pWYdm97iaqobxlPmKaxuxTSHw1D3Z9OvuQVeB2z+4G9xMhBBTJ0N671oZhUajpBy8OW4k9c8jl+joe01W+SScfk+qPV8ivjirTPYsUYRT3gtUgO/X/XuZ+EXGcnx+Brpu6FQtW6qSKH4Q+cofM4aohoopSIAP9dZ5zpQqQTACKyE=
+ bucket: rust-doc
+ endpoint: rust-doc.s3-website-us-east-1.amazonaws.com
+ skip_cleanup: true
+ local-dir: target/doc
+ upload-dir: slab/${TRAVIS_BRANCH}
+ acl: public_read
+ on:
+ condition: $TRAVIS_RUST_VERSION == "1.3.0" && $TRAVIS_OS_NAME == "linux"
+ repo: carllerche/slab
+ branch:
+ - master
diff --git a/Android.bp b/Android.bp
index e047244..81236b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,6 +11,7 @@ rust_library {
rust_defaults {
name: "slab_defaults",
crate_name: "slab",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2015",
@@ -19,18 +20,17 @@ rust_defaults {
rust_test_host {
name: "slab_host_test_src_lib",
defaults: ["slab_defaults"],
- srcs: ["src/lib.rs"],
}
rust_test {
name: "slab_device_test_src_lib",
defaults: ["slab_defaults"],
- srcs: ["src/lib.rs"],
}
rust_defaults {
name: "slab_defaults_slab",
crate_name: "slab",
+ srcs: ["tests/slab.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2015",
@@ -42,11 +42,9 @@ rust_defaults {
rust_test_host {
name: "slab_host_test_tests_slab",
defaults: ["slab_defaults_slab"],
- srcs: ["tests/slab.rs"],
}
rust_test {
name: "slab_device_test_tests_slab",
defaults: ["slab_defaults_slab"],
- srcs: ["tests/slab.rs"],
}
diff --git a/METADATA b/METADATA
index 4476b59..eaf9e79 100644
--- a/METADATA
+++ b/METADATA
@@ -1,17 +1,19 @@
name: "slab"
-description:
- "Pre-allocated storage for a uniform data type"
-
+description: "Pre-allocated storage for a uniform data type"
third_party {
url {
type: HOMEPAGE
value: "https://crates.io/crates/slab"
}
url {
- type: GIT
- value: "https://github.com/carllerche/slab"
+ type: ARCHIVE
+ value: "https://static.crates.io/crates/slab/slab-0.4.2.crate"
}
version: "0.4.2"
- last_upgrade_date { year: 2020 month: 3 day: 17 }
license_type: NOTICE
+ last_upgrade_date {
+ year: 2020
+ month: 3
+ day: 17
+ }
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 81e461a..2e66c7a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,3 +1,4 @@
+// Generated by cargo2android.py for tests in Android.bp
{
"presubmit": [
{