Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.9.0 with backports from master #231

Merged
merged 19 commits into from
Jun 17, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Assume support for const-generics
  • Loading branch information
cuviper committed Jun 16, 2022
commit 9c54555ff58aab35149852d4d0908c740c679dd9
1 change: 0 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ fn main() {
Some(_) => autocfg::emit("has_std"),
None => autocfg::new().emit_sysroot_crate("std"),
}
autocfg::new().emit_rustc_version(1, 51);
autocfg::rerun_path("build.rs");
}
4 changes: 2 additions & 2 deletions src/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ where
}
}

#[cfg(all(has_std, rustc_1_51))]
#[cfg(has_std)]
impl<K, V, const N: usize> From<[(K, V); N]> for IndexMap<K, V, RandomState>
where
K: Hash + Eq,
Expand Down Expand Up @@ -1906,7 +1906,7 @@ mod tests {
}

#[test]
#[cfg(all(has_std, rustc_1_51))]
#[cfg(has_std)]
fn from_array() {
let map = IndexMap::from([(1, 2), (3, 4)]);
let mut expected = IndexMap::new();
Expand Down
4 changes: 2 additions & 2 deletions src/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ where
}
}

#[cfg(all(has_std, rustc_1_51))]
#[cfg(has_std)]
impl<T, const N: usize> From<[T; N]> for IndexSet<T, RandomState>
where
T: Eq + Hash,
Expand Down Expand Up @@ -1882,7 +1882,7 @@ mod tests {
}

#[test]
#[cfg(all(has_std, rustc_1_51))]
#[cfg(has_std)]
fn from_array() {
let set1 = IndexSet::from([1, 2, 3, 4]);
let set2: IndexSet<_> = [1, 2, 3, 4].into();
Expand Down