about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-05-11 10:25:14 +0000
committerbors <bors@rust-lang.org>2021-05-11 10:25:14 +0000
commit918a1a20b1d10e2cc28cf27a56d43574cd09d79f (patch)
tree589d1872a7bac2d8273382ebb8eebac4895fd01e
parenta8804e7bdb7cbd4819573fae199f1e212f24c745 (diff)
parentc0095be6ee375ab1965a424502cfa1844d3b889f (diff)
downloadrust-918a1a20b1d10e2cc28cf27a56d43574cd09d79f.tar.gz
rust-918a1a20b1d10e2cc28cf27a56d43574cd09d79f.zip
Auto merge of #85109 - RalfJung:remove-const_fn, r=oli-obk
remove const_fn feature gate

Fixes https://github.com/rust-lang/rust/issues/84510
r? `@oli-obk`
-rw-r--r--tests/ui/new_without_default.rs1
-rw-r--r--tests/ui/new_without_default.stderr12
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/ui/new_without_default.rs b/tests/ui/new_without_default.rs
index 64659b63f46..58094646b50 100644
--- a/tests/ui/new_without_default.rs
+++ b/tests/ui/new_without_default.rs
@@ -1,4 +1,3 @@
-#![feature(const_fn)]
 #![allow(dead_code, clippy::missing_safety_doc)]
 #![warn(clippy::new_without_default)]
 
diff --git a/tests/ui/new_without_default.stderr b/tests/ui/new_without_default.stderr
index 973836f75a9..56c5fe1c618 100644
--- a/tests/ui/new_without_default.stderr
+++ b/tests/ui/new_without_default.stderr
@@ -1,5 +1,5 @@
 error: you should consider adding a `Default` implementation for `Foo`
-  --> $DIR/new_without_default.rs:8:5
+  --> $DIR/new_without_default.rs:7:5
    |
 LL | /     pub fn new() -> Foo {
 LL | |         Foo
@@ -17,7 +17,7 @@ LL | }
    |
 
 error: you should consider adding a `Default` implementation for `Bar`
-  --> $DIR/new_without_default.rs:16:5
+  --> $DIR/new_without_default.rs:15:5
    |
 LL | /     pub fn new() -> Self {
 LL | |         Bar
@@ -34,7 +34,7 @@ LL | }
    |
 
 error: you should consider adding a `Default` implementation for `LtKo<'c>`
-  --> $DIR/new_without_default.rs:80:5
+  --> $DIR/new_without_default.rs:79:5
    |
 LL | /     pub fn new() -> LtKo<'c> {
 LL | |         unimplemented!()
@@ -51,7 +51,7 @@ LL | }
    |
 
 error: you should consider adding a `Default` implementation for `NewNotEqualToDerive`
-  --> $DIR/new_without_default.rs:157:5
+  --> $DIR/new_without_default.rs:156:5
    |
 LL | /     pub fn new() -> Self {
 LL | |         NewNotEqualToDerive { foo: 1 }
@@ -68,7 +68,7 @@ LL | }
    |
 
 error: you should consider adding a `Default` implementation for `FooGenerics<T>`
-  --> $DIR/new_without_default.rs:165:5
+  --> $DIR/new_without_default.rs:164:5
    |
 LL | /     pub fn new() -> Self {
 LL | |         Self(Default::default())
@@ -85,7 +85,7 @@ LL | }
    |
 
 error: you should consider adding a `Default` implementation for `BarGenerics<T>`
-  --> $DIR/new_without_default.rs:172:5
+  --> $DIR/new_without_default.rs:171:5
    |
 LL | /     pub fn new() -> Self {
 LL | |         Self(Default::default())