diff options
| author | bors <bors@rust-lang.org> | 2019-05-10 00:51:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-10 00:51:14 +0000 |
| commit | 03bd2f653f0d0adb69d862fbeec64663157e71e1 (patch) | |
| tree | 3067cec05b04e1d4e72aef71a9be0d1a5f83affc /src/libstd | |
| parent | adcd4aa8d07945d5ef09129b05e8e1ff1bcce58e (diff) | |
| parent | 45b09453dbf120cc23d889435aac3ed7d2ec8eb7 (diff) | |
| download | rust-03bd2f653f0d0adb69d862fbeec64663157e71e1.tar.gz rust-03bd2f653f0d0adb69d862fbeec64663157e71e1.zip | |
Auto merge of #60683 - Centril:rollup-p05qh5d, r=Centril
Rollup of 8 pull requests Successful merges: - #59348 (Clean up and add tests for slice drop shims) - #60188 (Identify when a stmt could have been parsed as an expr) - #60234 (std: Derive `Default` for `io::Cursor`) - #60618 (Comment ext::tt::transcribe) - #60648 (Skip codegen for one UI test with long file path) - #60671 (remove unneeded `extern crate`s from build tools) - #60675 (Remove the old await! macro) - #60676 (Fix async desugaring providing wrong input to procedural macros.) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/cursor.rs | 2 | ||||
| -rw-r--r-- | src/libstd/macros.rs | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index f627fb0f562..a94176e7100 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -72,7 +72,7 @@ use core::convert::TryInto; /// } /// ``` #[stable(feature = "rust1", since = "1.0.0")] -#[derive(Clone, Debug)] +#[derive(Clone, Debug, Default)] pub struct Cursor<T> { inner: T, pos: u64, diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 9eba76cc04a..03aebeda47c 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -357,29 +357,6 @@ macro_rules! dbg { }; } -/// Awaits the completion of an async call. -#[macro_export] -#[unstable(feature = "await_macro", issue = "50547")] -#[allow_internal_unstable(gen_future, generators)] -#[allow_internal_unsafe] -macro_rules! r#await { - ($e:expr) => { { - let mut pinned = $e; - loop { - if let $crate::task::Poll::Ready(x) = - $crate::future::poll_with_tls_context(unsafe { - $crate::pin::Pin::new_unchecked(&mut pinned) - }) - { - break x; - } - // FIXME(cramertj) prior to stabilizing await, we have to ensure that this - // can't be used to create a generator on stable via `|| await!()`. - yield - } - } } -} - /// Selects the first successful receive event from a number of receivers. /// /// This macro is used to wait for the first event to occur on a number of |