Skip to content

Commit

Permalink
Merge branch 'master' into taiki-e/rust-2021
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e authored Dec 8, 2024
2 parents f6d349a + be150d6 commit 8966399
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ scoped-tls = "1.0.0"
generator = "0.8.1"

# Requires for "checkpoint" feature
serde = { version = "1.0.92", features = ["derive"], optional = true }
serde = { version = "1.0.113", features = ["derive"], optional = true }
serde_json = { version = "1.0.33", optional = true }

# Requires for "futures" feature
Expand Down
2 changes: 1 addition & 1 deletion src/rt/object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ impl<T> Store<T> {
})
}

pub(super) fn iter_mut<'a, O>(&'a mut self) -> impl DoubleEndedIterator<Item = &mut O>
pub(super) fn iter_mut<'a, O>(&'a mut self) -> impl DoubleEndedIterator<Item = &'a mut O>
where
O: Object<Entry = T> + 'a,
{
Expand Down
2 changes: 1 addition & 1 deletion src/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ impl<T: 'static> LocalKey<T> {
Ok(f(value))
}

unsafe fn get(&'static self) -> Option<Result<&T, AccessError>> {
unsafe fn get(&'static self) -> Option<Result<&'static T, AccessError>> {
unsafe fn transmute_lt<'a, 'b, T>(t: &'a T) -> &'b T {
std::mem::transmute::<&'a T, &'b T>(t)
}
Expand Down

0 comments on commit 8966399

Please sign in to comment.