Auto merge of #4423 - lzutao:await-is-stable, r=Manishearth

Remove feature gate for async_await async/await is stablized in rust-lang/rust#63209 🎉 changelog: none
rust-lang · Aug 20, 2019 · 460e265 · 460e265
2 parents 0ccb9ea + 2a66196
commit 460e265
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/tests/ui/issue_4266.rs b/tests/ui/issue_4266.rs
@@ -1,5 +1,4 @@
 // compile-flags: --edition 2018
-#![feature(async_await)]
 #![allow(dead_code)]
 
 async fn sink1<'a>(_: &'a str) {} // lint

diff --git a/tests/ui/issue_4266.stderr b/tests/ui/issue_4266.stderr
@@ -1,13 +1,13 @@
 error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
- --> $DIR/issue_4266.rs:5:1
+ --> $DIR/issue_4266.rs:4:1
  |
 LL | async fn sink1<'a>(_: &'a str) {} // lint
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: `-D clippy::needless-lifetimes` implied by `-D warnings`
 
 error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
- --> $DIR/issue_4266.rs:9:1
+ --> $DIR/issue_4266.rs:8:1
  |
 LL | / async fn one_to_one<'a>(s: &'a str) -> &'a str {
 LL | | s

diff --git a/tests/ui/methods.rs b/tests/ui/methods.rs
@@ -1,7 +1,6 @@
 // aux-build:option_helpers.rs
 // compile-flags: --edition 2018
 
-#![feature(async_await)]
 #![warn(clippy::all, clippy::pedantic, clippy::option_unwrap_used)]
 #![allow(
  clippy::blacklisted_name,

diff --git a/tests/ui/methods.stderr b/tests/ui/methods.stderr
@@ -1,5 +1,5 @@
 error: defining a method called `add` on this type; consider implementing the `std::ops::Add` trait or choosing a less ambiguous name
- --> $DIR/methods.rs:37:5
+ --> $DIR/methods.rs:36:5
  |
 LL | / pub fn add(self, other: T) -> T {
 LL | | self
@@ -9,7 +9,7 @@ LL | | }
  = note: `-D clippy::should-implement-trait` implied by `-D warnings`
 
 error: methods called `new` usually return `Self`
- --> $DIR/methods.rs:153:5
+ --> $DIR/methods.rs:152:5
  |
 LL | / fn new() -> i32 {
 LL | | 0
@@ -19,7 +19,7 @@ LL | | }
  = note: `-D clippy::new-ret-no-self` implied by `-D warnings`
 
 error: called `map(f).unwrap_or(a)` on an Option value. This can be done more directly by calling `map_or(a, f)` instead
- --> $DIR/methods.rs:175:13
+ --> $DIR/methods.rs:174:13
  |
 LL | let _ = opt.map(|x| x + 1)
  | _____________^
@@ -31,7 +31,7 @@ LL | | .unwrap_or(0);
  = note: replace `map(|x| x + 1).unwrap_or(0)` with `map_or(0, |x| x + 1)`
 
 error: called `map(f).unwrap_or(a)` on an Option value. This can be done more directly by calling `map_or(a, f)` instead
- --> $DIR/methods.rs:179:13
+ --> $DIR/methods.rs:178:13
  |
 LL | let _ = opt.map(|x| {
  | _____________^
@@ -41,7 +41,7 @@ LL | | ).unwrap_or(0);
  | |____________________________^
 
 error: called `map(f).unwrap_or(a)` on an Option value. This can be done more directly by calling `map_or(a, f)` instead
- --> $DIR/methods.rs:183:13
+ --> $DIR/methods.rs:182:13
  |
 LL | let _ = opt.map(|x| x + 1)
  | _____________^
@@ -51,15 +51,15 @@ LL | | });
  | |__________________^
 
 error: called `map(f).unwrap_or(None)` on an Option value. This can be done more directly by calling `and_then(f)` instead
- --> $DIR/methods.rs:188:13
+ --> $DIR/methods.rs:187:13
  |
 LL | let _ = opt.map(|x| Some(x + 1)).unwrap_or(None);
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: replace `map(|x| Some(x + 1)).unwrap_or(None)` with `and_then(|x| Some(x + 1))`
 
 error: called `map(f).unwrap_or(None)` on an Option value. This can be done more directly by calling `and_then(f)` instead
- --> $DIR/methods.rs:190:13
+ --> $DIR/methods.rs:189:13
  |
 LL | let _ = opt.map(|x| {
  | _____________^
@@ -69,7 +69,7 @@ LL | | ).unwrap_or(None);
  | |_____________________^
 
 error: called `map(f).unwrap_or(None)` on an Option value. This can be done more directly by calling `and_then(f)` instead
- --> $DIR/methods.rs:194:13
+ --> $DIR/methods.rs:193:13
  |
 LL | let _ = opt
  | _____________^
@@ -80,15 +80,15 @@ LL | | .unwrap_or(None);
  = note: replace `map(|x| Some(x + 1)).unwrap_or(None)` with `and_then(|x| Some(x + 1))`
 
 error: called `map(f).unwrap_or(a)` on an Option value. This can be done more directly by calling `map_or(a, f)` instead
- --> $DIR/methods.rs:205:13
+ --> $DIR/methods.rs:204:13
  |
 LL | let _ = Some("prefix").map(|p| format!("{}.", p)).unwrap_or(id);
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: replace `map(|p| format!("{}.", p)).unwrap_or(id)` with `map_or(id, |p| format!("{}.", p))`
 
 error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
- --> $DIR/methods.rs:209:13
+ --> $DIR/methods.rs:208:13
  |
 LL | let _ = opt.map(|x| x + 1)
  | _____________^
@@ -100,7 +100,7 @@ LL | | .unwrap_or_else(|| 0);
  = note: replace `map(|x| x + 1).unwrap_or_else(|| 0)` with `map_or_else(|| 0, |x| x + 1)`
 
 error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
- --> $DIR/methods.rs:213:13
+ --> $DIR/methods.rs:212:13
  |
 LL | let _ = opt.map(|x| {
  | _____________^
@@ -110,7 +110,7 @@ LL | | ).unwrap_or_else(|| 0);
  | |____________________________________^
 
 error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
- --> $DIR/methods.rs:217:13
+ --> $DIR/methods.rs:216:13
  |
 LL | let _ = opt.map(|x| x + 1)
  | _____________^
@@ -120,7 +120,7 @@ LL | | );
  | |_________________^
 
 error: called `filter(p).next()` on an `Iterator`. This is more succinctly expressed by calling `.find(p)` instead.
- --> $DIR/methods.rs:247:13
+ --> $DIR/methods.rs:246:13
  |
 LL | let _ = v.iter().filter(|&x| *x < 0).next();
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -129,7 +129,7 @@ LL | let _ = v.iter().filter(|&x| *x < 0).next();
  = note: replace `filter(|&x| *x < 0).next()` with `find(|&x| *x < 0)`
 
 error: called `filter(p).next()` on an `Iterator`. This is more succinctly expressed by calling `.find(p)` instead.
- --> $DIR/methods.rs:250:13
+ --> $DIR/methods.rs:249:13
  |
 LL | let _ = v.iter().filter(|&x| {
  | _____________^
@@ -139,7 +139,7 @@ LL | | ).next();
  | |___________________________^
 
 error: called `is_some()` after searching an `Iterator` with find. This is more succinctly expressed by calling `any()`.
- --> $DIR/methods.rs:266:13
+ --> $DIR/methods.rs:265:13
  |
 LL | let _ = v.iter().find(|&x| *x < 0).is_some();
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -148,7 +148,7 @@ LL | let _ = v.iter().find(|&x| *x < 0).is_some();
  = note: replace `find(|&x| *x < 0).is_some()` with `any(|x| *x < 0)`
 
 error: called `is_some()` after searching an `Iterator` with find. This is more succinctly expressed by calling `any()`.
- --> $DIR/methods.rs:269:13
+ --> $DIR/methods.rs:268:13
  |
 LL | let _ = v.iter().find(|&x| {
  | _____________^
@@ -158,15 +158,15 @@ LL | | ).is_some();
  | |______________________________^
 
 error: called `is_some()` after searching an `Iterator` with position. This is more succinctly expressed by calling `any()`.
- --> $DIR/methods.rs:275:13
+ --> $DIR/methods.rs:274:13
  |
 LL | let _ = v.iter().position(|&x| x < 0).is_some();
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: replace `position(|&x| x < 0).is_some()` with `any(|&x| x < 0)`
 
 error: called `is_some()` after searching an `Iterator` with position. This is more succinctly expressed by calling `any()`.
- --> $DIR/methods.rs:278:13
+ --> $DIR/methods.rs:277:13
  |
 LL | let _ = v.iter().position(|&x| {
  | _____________^
@@ -176,15 +176,15 @@ LL | | ).is_some();
  | |______________________________^
 
 error: called `is_some()` after searching an `Iterator` with rposition. This is more succinctly expressed by calling `any()`.
- --> $DIR/methods.rs:284:13
+ --> $DIR/methods.rs:283:13
  |
 LL | let _ = v.iter().rposition(|&x| x < 0).is_some();
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: replace `rposition(|&x| x < 0).is_some()` with `any(|&x| x < 0)`
 
 error: called `is_some()` after searching an `Iterator` with rposition. This is more succinctly expressed by calling `any()`.
- --> $DIR/methods.rs:287:13
+ --> $DIR/methods.rs:286:13
  |
 LL | let _ = v.iter().rposition(|&x| {
  | _____________^
@@ -194,7 +194,7 @@ LL | | ).is_some();
  | |______________________________^
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
- --> $DIR/methods.rs:302:13
+ --> $DIR/methods.rs:301:13
  |
 LL | let _ = opt.unwrap();
  | ^^^^^^^^^^^^