Skip to content

Commit 0f5b52e

Browse files
cramertjcramertj
committed
Stabilize conservative_impl_trait
1 parent c393db6 commit 0f5b52e

File tree

68 files changed

+62
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+62
-240
lines changed

‎src/Cargo.lock

+3-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/doc/unstable-book/src/language-features/conservative-impl-trait.md

-66
This file was deleted.

‎src/libcore/tests/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#![cfg_attr(stage0, feature(inclusive_range_syntax))]
2828
#![feature(iterator_try_fold)]
2929
#![feature(iterator_flatten)]
30-
#![feature(conservative_impl_trait)]
30+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
3131
#![feature(iter_rfind)]
3232
#![feature(iter_rfold)]
3333
#![feature(iterator_repeat_with)]

‎src/librustc/diagnostics.rs

-8
Original file line numberDiff line numberDiff line change
@@ -1789,8 +1789,6 @@ allowed as function return types.
17891789
Erroneous code example:
17901790
17911791
```compile_fail,E0562
1792-
#![feature(conservative_impl_trait)]
1793-
17941792
fn main() {
17951793
let count_to_ten: impl Iterator<Item=usize> = 0..10;
17961794
// error: `impl Trait` not allowed outside of function and inherent method
@@ -1804,8 +1802,6 @@ fn main() {
18041802
Make sure `impl Trait` only appears in return-type position.
18051803
18061804
```
1807-
#![feature(conservative_impl_trait)]
1808-
18091805
fn count_to_n(n: usize) -> impl Iterator<Item=usize> {
18101806
0..n
18111807
}
@@ -2081,8 +2077,6 @@ appear within the `impl Trait` itself.
20812077
Erroneous code example:
20822078
20832079
```compile-fail,E0909
2084-
#![feature(conservative_impl_trait)]
2085-
20862080
use std::cell::Cell;
20872081
20882082
trait Trait<'a> { }
@@ -2109,8 +2103,6 @@ type. For example, changing the return type to `impl Trait<'y> + 'x`
21092103
would work:
21102104
21112105
```
2112-
#![feature(conservative_impl_trait)]
2113-
21142106
use std::cell::Cell;
21152107
21162108
trait Trait<'a> { }

‎src/librustc/hir/lowering.rs

-11
Original file line numberDiff line numberDiff line change
@@ -1108,20 +1108,9 @@ impl<'a> LoweringContext<'a> {
11081108
hir::TyTraitObject(bounds, lifetime_bound)
11091109
}
11101110
TyKind::ImplTrait(ref bounds) => {
1111-
use syntax::feature_gate::{emit_feature_err, GateIssue};
11121111
let span = t.span;
11131112
match itctx {
11141113
ImplTraitContext::Existential => {
1115-
let has_feature = self.sess.features_untracked().conservative_impl_trait;
1116-
if !t.span.allows_unstable() && !has_feature {
1117-
emit_feature_err(
1118-
&self.sess.parse_sess,
1119-
"conservative_impl_trait",
1120-
t.span,
1121-
GateIssue::Language,
1122-
"`impl Trait` in return position is experimental",
1123-
);
1124-
}
11251114
let def_index = self.resolver.definitions().opt_def_index(t.id).unwrap();
11261115
let hir_bounds = self.lower_bounds(bounds, itctx);
11271116
let (lifetimes, lifetime_defs) =

‎src/librustc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
#![feature(box_patterns)]
4545
#![feature(box_syntax)]
46-
#![feature(conservative_impl_trait)]
46+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
4747
#![feature(const_fn)]
4848
#![cfg_attr(stage0, feature(copy_closures, clone_closures))]
4949
#![feature(core_intrinsics)]

‎src/librustc_data_structures/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#![feature(unsize)]
2929
#![feature(i128_type)]
3030
#![feature(i128)]
31-
#![feature(conservative_impl_trait)]
31+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
3232
#![feature(specialization)]
3333
#![feature(optin_builtin_traits)]
3434
#![feature(underscore_lifetimes)]

‎src/librustc_errors/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#![allow(unused_attributes)]
1818
#![feature(range_contains)]
1919
#![cfg_attr(unix, feature(libc))]
20-
#![feature(conservative_impl_trait)]
20+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
2121
#![feature(i128_type)]
2222
#![feature(optin_builtin_traits)]
2323

‎src/librustc_incremental/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
html_root_url = "https://doc.rust-lang.org/nightly/")]
1616
#![deny(warnings)]
1717

18-
#![feature(conservative_impl_trait)]
18+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
1919
#![feature(fs_read_write)]
2020
#![feature(i128_type)]
2121
#![cfg_attr(stage0, feature(inclusive_range_syntax))]

‎src/librustc_metadata/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#![deny(warnings)]
1515

1616
#![feature(box_patterns)]
17-
#![feature(conservative_impl_trait)]
17+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
1818
#![feature(fs_read_write)]
1919
#![feature(i128_type)]
2020
#![feature(libc)]

‎src/librustc_mir/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
2121
#![feature(box_patterns)]
2222
#![feature(box_syntax)]
2323
#![feature(catch_expr)]
24-
#![feature(conservative_impl_trait)]
24+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
2525
#![feature(const_fn)]
2626
#![feature(core_intrinsics)]
2727
#![feature(decl_macro)]

‎src/librustc_trans/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#![feature(quote)]
3232
#![feature(rustc_diagnostic_macros)]
3333
#![cfg_attr(stage0, feature(slice_patterns))]
34-
#![feature(conservative_impl_trait)]
34+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
3535
#![feature(optin_builtin_traits)]
3636
#![feature(inclusive_range_fields)]
3737

‎src/librustc_trans_utils/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#![feature(i128_type)]
2525
#![feature(quote)]
2626
#![feature(rustc_diagnostic_macros)]
27-
#![feature(conservative_impl_trait)]
27+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
2828

2929
extern crate ar;
3030
extern crate flate2;

‎src/librustc_typeck/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This API is completely unstable and subject to change.
7575
#![cfg_attr(stage0, feature(advanced_slice_patterns))]
7676
#![feature(box_patterns)]
7777
#![feature(box_syntax)]
78-
#![feature(conservative_impl_trait)]
78+
#![cfg_attr(stage0, feature(conservative_impl_trait))]
7979
#![cfg_attr(stage0, feature(copy_closures, clone_closures))]
8080
#![feature(crate_visibility_modifier)]
8181
#![feature(from_ref)]

‎src/libsyntax/feature_gate.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,6 @@ declare_features! (
276276
// Allows cfg(target_has_atomic = "...").
277277
(active, cfg_target_has_atomic, "1.9.0", Some(32976), None),
278278

279-
// Allows `impl Trait` in function return types.
280-
(active, conservative_impl_trait, "1.12.0", Some(34511), None),
281-
282279
// Allows exhaustive pattern matching on types that contain uninhabited types.
283280
(active, exhaustive_patterns, "1.13.0", None, None),
284281

@@ -565,6 +562,8 @@ declare_features! (
565562
(accepted, copy_closures, "1.26.0", Some(44490), None),
566563
// Allows `impl Trait` in function arguments.
567564
(accepted, universal_impl_trait, "1.26.0", Some(34511), None),
565+
// Allows `impl Trait` in function return types.
566+
(accepted, conservative_impl_trait, "1.26.0", Some(34511), None),
568567
);
569568

570569
// If you change this, please modify src/doc/unstable-book as well. You must

‎src/test/compile-fail/conservative_impl_trait.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// #39872, #39553
1212

13-
#![feature(conservative_impl_trait)]
1413
fn will_ice(something: &u32) -> impl Iterator<Item = &u32> {
1514
//~^ ERROR the trait bound `(): std::iter::Iterator` is not satisfied [E0277]
1615
}

‎src/test/compile-fail/impl-trait/infinite-impl-trait-issue-38064.rs

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
// error-pattern:overflow evaluating the requirement `impl Quux`
1717

18-
#![feature(conservative_impl_trait)]
19-
2018
trait Quux {}
2119

2220
fn foo() -> impl Quux {

‎src/test/compile-fail/impl-trait/must_outlive_least_region_or_bound.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(conservative_impl_trait)]
12-
1311
use std::fmt::Debug;
1412

1513
fn elided(x: &i32) -> impl Copy { x }

‎src/test/compile-fail/impl-trait/needs_least_region_or_bound.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(conservative_impl_trait)]
12-
1311
use std::fmt::Debug;
1412

1513
trait MultiRegionTrait<'a, 'b> {}

‎src/test/compile-fail/impl-trait/no-trait.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(conservative_impl_trait)]
12-
1311
fn f() -> impl 'static {} //~ ERROR at least one trait must be specified
1412

1513
fn main() {}

‎src/test/compile-fail/impl-trait/type_parameters_captured.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(conservative_impl_trait)]
12-
1311
use std::fmt::Debug;
1412

1513
trait Any {}

‎src/test/compile-fail/impl-trait/where-allowed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
//! A simple test for testing many permutations of allowedness of
1212
//! impl Trait
13-
#![feature(conservative_impl_trait, dyn_trait)]
13+
#![feature(dyn_trait)]
1414
use std::fmt::Debug;
1515

1616
// Allowed

‎src/test/compile-fail/issue-32995-2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(conservative_impl_trait)]
1211
#![allow(unused)]
1312

1413
fn main() {

‎src/test/compile-fail/issue-35668.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(conservative_impl_trait)]
12-
1311
fn func<'a, T>(a: &'a [T]) -> impl Iterator<Item=&'a T> {
1412
a.iter().map(|a| a*a)
1513
//~^ ERROR binary operation `*` cannot be applied to type `&T`

‎src/test/compile-fail/issue-36379.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(conservative_impl_trait, rustc_attrs)]
11+
#![feature(rustc_attrs)]
1212

1313
fn _test() -> impl Default { }
1414

‎src/test/compile-fail/private-inferred-type.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
#![feature(associated_consts)]
12-
#![feature(conservative_impl_trait)]
1312
#![feature(decl_macro)]
1413
#![allow(private_in_public)]
1514

‎src/test/compile-fail/private-type-in-interface.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// aux-build:private-inferred-type.rs
1212

13-
#![feature(conservative_impl_trait)]
1413
#![allow(warnings)]
1514

1615
extern crate private_inferred_type as ext;

0 commit comments

Comments
 (0)