Merge #2

2: add an opt-out "const-fn" Cargo feature r=japaric a=japaric

to make this crate compilable on stable

Co-authored-by: Jorge Aparicio <jorge@japaric.io>

Author: bors[bot]

.travis.yml

@@ -0,0 +1,31 @@
+language: rust
+
+matrix:
+  include:
+    - env: TARGET=x86_64-unknown-linux-gnu
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: nightly
+
+before_install: set -e
+
+install:
+  - bash ci/install.sh
+
+script:
+  - bash ci/script.sh
+
+after_script: set +e
+
+cache: cargo
+before_cache:
+  # Travis can't cache files that are not readable by "others"
+  - chmod -R a+r $HOME/.cargo
+
+branches:
+  only:
+    - staging
+    - trying
+
+notifications:
+  email:
+    on_success: never

CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.1.2] - 2018-04-25
+
+### Added
+
+- an opt-out "const-fn" Cargo feature. Disabling this feature removes all `const` constructors and
+  makes this crate compilable on stable.
+
 ## [v0.1.1] - 2017-05-30
 
 ### Added
@@ -15,5 +22,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release
 
-[Unreleased]: https://github.com/japaric/aligned/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/japaric/aligned/compare/v0.1.2...HEAD
+[v0.1.2]: https://github.com/japaric/aligned/compare/v0.1.1...v0.1.2
 [v0.1.1]: https://github.com/japaric/aligned/compare/v0.1.0...v0.1.1

Cargo.toml

@@ -7,6 +7,8 @@ keywords = ["alignment", "aligned", "array", "static"]
 license = "MIT OR Apache-2.0"
 name = "aligned"
 repository = "https://github.com/japaric/aligned"
-version = "0.1.1"
+version = "0.1.2"
 
-[dependencies]
+[features]
+const-fn = []
+default = ["const-fn"]

bors.toml

@@ -0,0 +1,3 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]

ci/install.sh

@@ -0,0 +1,7 @@
+set -euxo pipefail
+
+main() {
+    :
+}
+
+main

ci/script.sh

@@ -0,0 +1,11 @@
+set -euxo pipefail
+
+main() {
+    cargo check --target $TARGET --no-default-features
+
+    if [ $TRAVIS_RUST_VERSION = nightly ]; then
+        cargo check --target $TARGET
+    fi
+}
+
+main

src/lib.rs

@@ -29,7 +29,7 @@
 
 #![deny(missing_docs)]
 #![deny(warnings)]
-#![feature(const_fn)]
+#![cfg_attr(feature = "const-fn", feature(const_fn))]
 #![no_std]
 
 use core::{mem, ops};
@@ -165,6 +165,7 @@ unsafe impl Alignment for u64 {}
 
 /// `Aligned` constructor
 #[allow(non_snake_case)]
+#[cfg(feature = "const-fn")]
 pub const fn Aligned<ALIGNMENT, ARRAY>(
     array: ARRAY,
 ) -> Aligned<ALIGNMENT, ARRAY>
@@ -177,6 +178,21 @@ where
     }
 }
 
+/// `Aligned` constructor
+#[allow(non_snake_case)]
+#[cfg(not(feature = "const-fn"))]
+pub fn Aligned<ALIGNMENT, ARRAY>(
+    array: ARRAY,
+) -> Aligned<ALIGNMENT, ARRAY>
+    where
+    ALIGNMENT: Alignment,
+{
+    Aligned {
+        _alignment: [],
+        array: array,
+    }
+}
+
 #[test]
 fn sanity() {
     use core::mem;