Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
thumbv6m-none-eabi,
x86_64-pc-windows-gnu,
]
channel: [1.63.0, nightly]
channel: [1.72.0, nightly]
include:
- os: macos-latest
target: x86_64-apple-darwin
Expand All @@ -68,10 +68,10 @@ jobs:
channel: nightly
- os: macos-latest
target: x86_64-apple-darwin
channel: 1.63.0
channel: 1.72.0
- os: windows-latest
target: x86_64-pc-windows-msvc
channel: 1.63.0
channel: 1.72.0
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
channel: beta
Expand Down
3 changes: 0 additions & 3 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ if [ "${CHANNEL}" = "nightly" ]; then
FEATURES="${FEATURES},nightly"
export RUSTFLAGS="$RUSTFLAGS -D warnings"
fi
if [ "${CHANNEL}" = "1.63.0" ]; then
cargo update --package allocator-api2 --precise 0.2.9
fi

CARGO=cargo
if [ "${CROSS}" = "1" ]; then
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#![warn(missing_docs)]
#![warn(rust_2018_idioms)]
#![cfg_attr(feature = "nightly", warn(fuzzy_provenance_casts))]
#![cfg_attr(feature = "nightly", allow(internal_features))]

#[cfg(test)]
#[macro_use]
Expand Down
4 changes: 2 additions & 2 deletions src/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6805,7 +6805,7 @@ mod test_map {
assert_eq!(m2.len(), 2);
}

thread_local! { static DROP_VECTOR: RefCell<Vec<i32>> = RefCell::new(Vec::new()) }
thread_local! { static DROP_VECTOR: RefCell<Vec<i32>> = const { RefCell::new(Vec::new()) } }

#[derive(Hash, PartialEq, Eq)]
struct Droppable {
Expand Down Expand Up @@ -8524,7 +8524,7 @@ mod test_map {
#[test]
#[should_panic = "panic in clone"]
fn test_clone_from_memory_leaks() {
use ::alloc::vec::Vec;
use alloc::vec::Vec;

struct CheckedClone {
panic_in_clone: bool,
Expand Down
3 changes: 2 additions & 1 deletion src/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@ mod test_set {
assert_eq!(last_i, 49);
}

for _ in &s {
if !s.is_empty() {
panic!("s should be empty!");
}

Expand All @@ -2834,6 +2834,7 @@ mod test_set {
use core::hash;

#[derive(Debug)]
#[allow(dead_code)]
struct Foo(&'static str, i32);

impl PartialEq for Foo {
Expand Down