Skip to content

Commit

Permalink
Auto merge of servo#161 - Centril:master, r=emilio
Browse files Browse the repository at this point in the history
Move use of 'default fn' to its own module

This is the proper way to do `cfg(...)` gating when dealing with an unstable feature that introduces syntax.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-smallvec/161)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Aug 26, 2019
2 parents c83bb71 + 92122e2 commit 3ee6d1e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
7 changes: 1 addition & 6 deletions lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1253,12 +1253,7 @@ trait SpecFrom<A: Array, S> {
}

#[cfg(feature = "specialization")]
impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A> where A::Item: Clone {
#[inline]
default fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
slice.into_iter().cloned().collect()
}
}
mod specialization;

#[cfg(feature = "specialization")]
impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A> where A::Item: Copy {
Expand Down
16 changes: 16 additions & 0 deletions specialization.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

//! Implementations that require `default fn`.
use super::{SpecFrom, SmallVec, Array};

impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A> where A::Item: Clone {
#[inline]
default fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
slice.into_iter().cloned().collect()
}
}

0 comments on commit 3ee6d1e

Please sign in to comment.