Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/futures-rs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c7288aa01604790bfa45088933f810495fd48d99
Choose a base ref
..
head repository: rust-lang/futures-rs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aca5bc00cfd26b0d5a786eeeee80077a10db54ab
Choose a head ref
9 changes: 0 additions & 9 deletions futures-async-macro/src/error.rs
Original file line number Diff line number Diff line change
@@ -41,12 +41,3 @@ macro_rules! outside_of_async_error {
))
};
}

macro_rules! outside_of_async_stream_error {
($tokens:expr, $name:expr) => {
$crate::error::expr_compile_error(&syn::Error::new_spanned(
$tokens,
concat!($name, " cannot be allowed outside of async_stream blocks, and functions."),
))
};
}
2 changes: 1 addition & 1 deletion futures-util/src/future/fuse.rs
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ impl<Fut: Future> Fuse<Fut> {
/// # Examples
///
/// ```
/// #![feature(async_await, await_macro, futures_api)]
/// #![feature(async_await, await_macro)]
/// # futures::executor::block_on(async {
/// use futures::channel::mpsc;
/// use futures::future::{Fuse, FusedFuture, FutureExt};
2 changes: 1 addition & 1 deletion futures/testcrate/ui/bad-input.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#![feature(async_await, futures_api, generators)]
#![feature(async_await, generators)]

use futures::*;

2 changes: 1 addition & 1 deletion futures/testcrate/ui/bad-return-type.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(async_await, futures_api, generators)]
#![feature(async_await, generators)]

use futures::*;

2 changes: 1 addition & 1 deletion futures/testcrate/ui/forget-semicolon.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(async_await, futures_api, generators)]
#![feature(async_await, generators)]

use futures::*;

2 changes: 1 addition & 1 deletion futures/testcrate/ui/move-captured-variable.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(async_await, futures_api, generators, proc_macro_hygiene)]
#![feature(async_await, generators, proc_macro_hygiene)]

use futures::*;

2 changes: 1 addition & 1 deletion futures/testcrate/ui/nested.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(async_await, futures_api, generators)]
#![feature(async_await, generators)]

use futures::*;

2 changes: 1 addition & 1 deletion futures/testcrate/ui/type_error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(async_await, futures_api, generators)]
#![feature(async_await, generators)]

use futures::*;

2 changes: 1 addition & 1 deletion futures/testcrate/ui/unresolved-type.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(async_await, futures_api, generators)]
#![feature(async_await, generators)]

use futures::*;

2 changes: 1 addition & 1 deletion futures/tests/async_stream_tests.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(async_await, await_macro, futures_api)]
#![feature(async_await, await_macro)]
#![cfg_attr(all(feature = "async-stream", feature = "nightly"), feature(generators, stmt_expr_attributes, proc_macro_hygiene))]

#[cfg(all(feature = "async-stream", feature = "nightly"))]