Skip to content

Commit 003c4ff

Browse files
scottmcmscottmcm
committed
Allow both explicit and elided lifetimes in the same impl header
(While still prohibiting explicit and in-band in the same header.)
1 parent ed45f9c commit 003c4ff

File tree

5 files changed

+83
-29
lines changed

5 files changed

+83
-29
lines changed

‎src/librustc/hir/lowering.rs

+23-13
Original file line numberDiff line numberDiff line change
@@ -683,9 +683,15 @@ impl<'a> LoweringContext<'a> {
683683
// Get the name we'll use to make the def-path. Note
684684
// that collisions are ok here and this shouldn't
685685
// really show up for end-user.
686-
let str_name = match hir_name {
687-
ParamName::Plain(ident) => ident.as_interned_str(),
688-
ParamName::Fresh(_) => keywords::UnderscoreLifetime.name().as_interned_str(),
686+
let (str_name, kind) = match hir_name {
687+
ParamName::Plain(ident) => (
688+
ident.as_interned_str(),
689+
hir::LifetimeParamKind::InBand,
690+
),
691+
ParamName::Fresh(_) => (
692+
keywords::UnderscoreLifetime.name().as_interned_str(),
693+
hir::LifetimeParamKind::Elided,
694+
),
689695
};
690696

691697
// Add a definition for the in-band lifetime def
@@ -705,7 +711,7 @@ impl<'a> LoweringContext<'a> {
705711
bounds: hir_vec![],
706712
span,
707713
pure_wrt_drop: false,
708-
kind: hir::GenericParamKind::Lifetime { in_band: true }
714+
kind: hir::GenericParamKind::Lifetime { kind }
709715
}
710716
})
711717
.chain(in_band_ty_params.into_iter())
@@ -1452,11 +1458,15 @@ impl<'a> LoweringContext<'a> {
14521458
lifetime.span,
14531459
);
14541460

1455-
let name = match name {
1456-
hir::LifetimeName::Underscore => {
1457-
hir::ParamName::Plain(keywords::UnderscoreLifetime.ident())
1458-
}
1459-
hir::LifetimeName::Param(param_name) => param_name,
1461+
let (name, kind) = match name {
1462+
hir::LifetimeName::Underscore => (
1463+
hir::ParamName::Plain(keywords::UnderscoreLifetime.ident()),
1464+
hir::LifetimeParamKind::Elided,
1465+
),
1466+
hir::LifetimeName::Param(param_name) => (
1467+
param_name,
1468+
hir::LifetimeParamKind::Explicit,
1469+
),
14601470
_ => bug!("expected LifetimeName::Param or ParamName::Plain"),
14611471
};
14621472

@@ -1467,9 +1477,7 @@ impl<'a> LoweringContext<'a> {
14671477
pure_wrt_drop: false,
14681478
attrs: hir_vec![],
14691479
bounds: hir_vec![],
1470-
kind: hir::GenericParamKind::Lifetime {
1471-
in_band: false,
1472-
}
1480+
kind: hir::GenericParamKind::Lifetime { kind }
14731481
});
14741482
}
14751483
}
@@ -2283,7 +2291,9 @@ impl<'a> LoweringContext<'a> {
22832291
pure_wrt_drop: attr::contains_name(&param.attrs, "may_dangle"),
22842292
attrs: self.lower_attrs(&param.attrs),
22852293
bounds,
2286-
kind: hir::GenericParamKind::Lifetime { in_band: false }
2294+
kind: hir::GenericParamKind::Lifetime {
2295+
kind: hir::LifetimeParamKind::Explicit,
2296+
}
22872297
};
22882298

22892299
self.is_collecting_in_band_lifetimes = was_collecting_in_band;

‎src/librustc/hir/mod.rs

+17-4
Original file line numberDiff line numberDiff line change
@@ -499,14 +499,27 @@ impl GenericBound {
499499

500500
pub type GenericBounds = HirVec<GenericBound>;
501501

502+
#[derive(Copy, Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Debug)]
503+
pub enum LifetimeParamKind {
504+
// Indicates that the lifetime definition was explicitly declared, like:
505+
// `fn foo<'a>(x: &'a u8) -> &'a u8 { x }`
506+
Explicit,
507+
508+
// Indicates that the lifetime definition was synthetically added
509+
// as a result of an in-band lifetime usage like:
510+
// `fn foo(x: &'a u8) -> &'a u8 { x }`
511+
InBand,
512+
513+
// Indication that the lifetime was elided like both cases here:
514+
// `fn foo(x: &u8) -> &'_ u8 { x }`
515+
Elided,
516+
}
517+
502518
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
503519
pub enum GenericParamKind {
504520
/// A lifetime definition, eg `'a: 'b + 'c + 'd`.
505521
Lifetime {
506-
// Indicates that the lifetime definition was synthetically added
507-
// as a result of an in-band lifetime usage like:
508-
// `fn foo(x: &'a u8) -> &'a u8 { x }`
509-
in_band: bool,
522+
kind: LifetimeParamKind,
510523
},
511524
Type {
512525
default: Option<P<Ty>>,

‎src/librustc/ich/impls_hir.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,20 @@ impl_stable_hash_for!(struct hir::GenericParam {
207207
kind
208208
});
209209

210+
impl_stable_hash_for!(enum hir::LifetimeParamKind {
211+
Explicit,
212+
InBand,
213+
Elided
214+
});
215+
210216
impl<'a> HashStable<StableHashingContext<'a>> for hir::GenericParamKind {
211217
fn hash_stable<W: StableHasherResult>(&self,
212218
hcx: &mut StableHashingContext<'a>,
213219
hasher: &mut StableHasher<W>) {
214220
mem::discriminant(self).hash_stable(hcx, hasher);
215221
match self {
216-
hir::GenericParamKind::Lifetime { in_band } => {
217-
in_band.hash_stable(hcx, hasher);
222+
hir::GenericParamKind::Lifetime { kind } => {
223+
kind.hash_stable(hcx, hasher);
218224
}
219225
hir::GenericParamKind::Type { ref default, synthetic } => {
220226
default.hash_stable(hcx, hasher);

‎src/librustc/middle/resolve_lifetime.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use syntax_pos::Span;
3535
use util::nodemap::{DefIdMap, FxHashMap, FxHashSet, NodeMap, NodeSet};
3636

3737
use hir::intravisit::{self, NestedVisitorMap, Visitor};
38-
use hir::{self, GenericParamKind};
38+
use hir::{self, GenericParamKind, LifetimeParamKind};
3939

4040
/// The origin of a named lifetime definition.
4141
///
@@ -51,8 +51,8 @@ pub enum LifetimeDefOrigin {
5151
impl LifetimeDefOrigin {
5252
fn from_param(param: &GenericParam) -> Self {
5353
match param.kind {
54-
GenericParamKind::Lifetime { in_band } => {
55-
if in_band {
54+
GenericParamKind::Lifetime { kind } => {
55+
if kind == LifetimeParamKind::InBand {
5656
LifetimeDefOrigin::InBand
5757
} else {
5858
LifetimeDefOrigin::Explicit
@@ -1087,15 +1087,15 @@ fn check_mixed_explicit_and_in_band_defs(
10871087
tcx: TyCtxt<'_, '_, '_>,
10881088
params: &P<[hir::GenericParam]>,
10891089
) {
1090-
let in_bands: Vec<_> = params.iter().filter_map(|param| match param.kind {
1091-
GenericParamKind::Lifetime { in_band, .. } => Some((in_band, param.span)),
1090+
let lifetime_params: Vec<_> = params.iter().filter_map(|param| match param.kind {
1091+
GenericParamKind::Lifetime { kind, .. } => Some((kind, param.span)),
10921092
_ => None,
10931093
}).collect();
1094-
let out_of_band = in_bands.iter().find(|(in_band, _)| !in_band);
1095-
let in_band = in_bands.iter().find(|(in_band, _)| *in_band);
1094+
let explicit = lifetime_params.iter().find(|(kind, _)| *kind == LifetimeParamKind::Explicit);
1095+
let in_band = lifetime_params.iter().find(|(kind, _)| *kind == LifetimeParamKind::InBand);
10961096

1097-
if let (Some((_, out_of_band_span)), Some((_, in_band_span)))
1098-
= (out_of_band, in_band) {
1097+
if let (Some((_, explicit_span)), Some((_, in_band_span)))
1098+
= (explicit, in_band) {
10991099
struct_span_err!(
11001100
tcx.sess,
11011101
*in_band_span,
@@ -1104,7 +1104,7 @@ fn check_mixed_explicit_and_in_band_defs(
11041104
).span_label(
11051105
*in_band_span,
11061106
"in-band lifetime definition here",
1107-
).span_label(*out_of_band_span, "explicit lifetime definition here")
1107+
).span_label(*explicit_span, "explicit lifetime definition here")
11081108
.emit();
11091109
}
11101110
}

‎src/test/ui/impl-header-lifetime-elision/explicit-and-elided-same-header.rs

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// run-pass
12+
13+
#![allow(warnings)]
14+
15+
#![feature(impl_header_lifetime_elision)]
16+
17+
// This works for functions...
18+
fn foo<'a>(x: &str, y: &'a str) {}
19+
20+
// ...so this should work for impls
21+
impl<'a> Foo<&str> for &'a str {}
22+
trait Foo<T> {}
23+
24+
fn main() {
25+
}

0 commit comments

Comments
 (0)