Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc_typeck/collect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,7 @@ fn type_of_def_id<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
NodeItem(item) => {
match item.node {
ItemStatic(ref t, _, _) | ItemConst(ref t, _) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forget, did the RFC cover both constants and statics? Presumably yes.

ccx.icx(&()).to_ty(&ExplicitRscope, &t)
ccx.icx(&()).to_ty(&ElidableRscope::new(ty::ReStatic), &t)
}
ItemFn(ref decl, unsafety, _, abi, ref generics, _) => {
let tofd = AstConv::ty_of_bare_fn(&ccx.icx(generics), unsafety, abi, &decl,
Expand Down
34 changes: 34 additions & 0 deletions src/test/compile-fail/rfc1623.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![allow(dead_code)]

fn non_elidable<'a, 'b>(a: &'a u8, b: &'b u8) -> &'a u8 { a }

// the boundaries of elision
static NON_ELIDABLE_FN : &fn(&u8, &u8) -> &u8 =
//~^ ERROR: missing lifetime specifier
&(non_elidable as fn(&u8, &u8) -> &u8);

type Baz<'a> = fn(&'a [u8]) -> Option<u8>;

fn baz(e: &[u8]) -> Option<u8> { e.first().map(|x| *x) }

static STATIC_BAZ : &Baz<'static> = &(baz as Baz);
const CONST_BAZ : &Baz<'static> = &(baz as Baz);

fn main() {
let x = &[1u8, 2, 3];
let y = x;

//surprisingly this appears to work, so lifetime < `'static` is valid
assert_eq!(Some(1), STATIC_BAZ(y));
assert_eq!(Some(1), CONST_BAZ(y));
}
82 changes: 82 additions & 0 deletions src/test/run-pass/rfc1623.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![allow(dead_code)]

// very simple test for a 'static static with default lifetime
static STATIC_STR : &str = "&'static str";
const CONST_STR : &str = "&'static str";

// this should be the same as without default:
static EXPLICIT_STATIC_STR : &'static str = "&'static str";
const EXPLICIT_CONST_STR : &'static str = "&'static str";

// a function that elides to an unbound lifetime for both in- and output
fn id_u8_slice(arg: &[u8]) -> &[u8] { arg }

// one with a function, argument elided
static STATIC_SIMPLE_FN : &fn(&[u8]) -> &[u8] =
&(id_u8_slice as fn(&[u8]) -> &[u8]);
const CONST_SIMPLE_FN : &fn(&[u8]) -> &[u8] =
&(id_u8_slice as fn(&[u8]) -> &[u8]);

// this should be the same as without elision
static STATIC_NON_ELIDED_fN : &for<'a> fn(&'a [u8]) -> &'a [u8] =
&(id_u8_slice as for<'a> fn(&'a [u8]) -> &'a [u8]);
const CONST_NON_ELIDED_fN : &for<'a> fn(&'a [u8]) -> &'a [u8] =
&(id_u8_slice as for<'a> fn(&'a [u8]) -> &'a [u8]);

// another function that elides, each to a different unbound lifetime
fn multi_args(a: &u8, b: &u8, c: &u8) { }

static STATIC_MULTI_FN : &fn(&u8, &u8, &u8) =
&(multi_args as fn(&u8, &u8, &u8));
const CONST_MULTI_FN : &fn(&u8, &u8, &u8) =
&(multi_args as fn(&u8, &u8, &u8));

struct Foo<'a> {
bools: &'a [bool]
}

static STATIC_FOO : Foo = Foo { bools: &[true, false] };
const CONST_FOO : Foo = Foo { bools: &[true, false] };

type Bar<'a> = Foo<'a>;

static STATIC_BAR : Bar = Bar { bools: &[true, false] };
const CONST_BAR : Bar = Bar { bools: &[true, false] };

type Baz<'a> = fn(&'a [u8]) -> Option<u8>;

fn baz(e: &[u8]) -> Option<u8> { e.first().map(|x| *x) }

static STATIC_BAZ : &Baz = &(baz as Baz);
const CONST_BAZ : &Baz = &(baz as Baz);

static BYTES : &[u8] = &[1, 2, 3];

fn main() {
// make sure that the lifetime is actually elided (and not defaulted)
let x = &[1u8, 2, 3];
STATIC_SIMPLE_FN(x);
CONST_SIMPLE_FN(x);

let y = &[1u8, 2, 3];
STATIC_BAZ(BYTES);
//CONST_BAZ(y); // strangely enough, this fails

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you elaborate? how does it fail?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I created a play version: https://is.gd/RBg85e and I see now what you mean. This is, I think, expected! The type of Baz would be &'static fn(&'static [u8]) -> Option<u8>, and yet when you supply y it only has a lifetime confined to the current stack frame. If you change to CONST_BAZ(BYTES) it should work, I think.


// make sure this works with different lifetimes
let a = &1;
{
let b = &2;
let c = &3;
CONST_MULTI_FN(a, b, c);
}
}