diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2022-02-24 20:03:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 20:03:12 -0500 |
| commit | 3b12afd0723b288feb7c8c53ac3938a17fd0e57c (patch) | |
| tree | 8ac398efaef6e59e3ab2278f378706aa44b5641e /core | |
| parent | c59152e4000393ad122855c26198c1d942497c00 (diff) | |
chore: upgrade to Rust 1.59 (#13767)
Diffstat (limited to 'core')
| -rw-r--r-- | core/async_cancel.rs | 20 | ||||
| -rw-r--r-- | core/module_specifier.rs | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/core/async_cancel.rs b/core/async_cancel.rs index 4c1cded0e..e8f25136c 100644 --- a/core/async_cancel.rs +++ b/core/async_cancel.rs @@ -460,18 +460,18 @@ mod internal { /// must refer to a head (`CancelHandle`) node. fn cancel(&mut self) { let mut head_nn = NonNull::from(self); - let mut item_nn; // Mark the head node as canceled. - match replace(unsafe { head_nn.as_mut() }, NodeInner::Canceled) { - NodeInner::Linked { - kind: NodeKind::Head { .. }, - next: next_nn, - .. - } => item_nn = next_nn, - NodeInner::Unlinked | NodeInner::Canceled => return, - _ => unreachable!(), - }; + let mut item_nn = + match replace(unsafe { head_nn.as_mut() }, NodeInner::Canceled) { + NodeInner::Linked { + kind: NodeKind::Head { .. }, + next: next_nn, + .. + } => next_nn, + NodeInner::Unlinked | NodeInner::Canceled => return, + _ => unreachable!(), + }; // Cancel all item nodes in the chain, waking each stored `Waker`. while item_nn != head_nn { diff --git a/core/module_specifier.rs b/core/module_specifier.rs index d09c4afb5..ecdebbd74 100644 --- a/core/module_specifier.rs +++ b/core/module_specifier.rs @@ -397,7 +397,7 @@ mod tests { // Relative local path. let expected_url = format!( "file:///{}/tests/006_url_imports.ts", - cwd_str.replace("\\", "/") + cwd_str.replace('\\', "/") ); tests.extend(vec![ (r"tests/006_url_imports.ts", expected_url.to_string()), |