user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add static_in_const feature gate

Browse source 
also updates tests and deletes the spurious .bk files I inadvertently
added last time.
This commit is contained in:
Andre Bogus 2016-09-07 23:18:46 +02:00
parent cf0cdc452b
commit 41d1cd7196
9 changed files with 48 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/compile-fail/const-unsized.rs
View file

@ -15,6 +15,7 @@ const CONST_0: Debug+Sync = *(&0 as &(Debug+Sync));
//~| NOTE `std::fmt::Debug + Sync + 'static: std::marker::Sized` not satisfied
//~| NOTE does not have a constant size known at compile-time
//~| NOTE constant expressions must have a statically known size
//~| WARNING This needs a `'static` lifetime or the `static_in_const` feature
const CONST_FOO: str = *"foo";
//~^ ERROR `str: std::marker::Sized` is not satisfied
@ -27,6 +28,7 @@ static STATIC_1: Debug+Sync = *(&1 as &(Debug+Sync));
//~| NOTE `std::fmt::Debug + Sync + 'static: std::marker::Sized` not satisfied
//~| NOTE does not have a constant size known at compile-time
//~| NOTE constant expressions must have a statically known size
//~| WARNING This needs a `'static` lifetime or the `static_in_const` feature
static STATIC_BAR: str = *"bar";
//~^ ERROR `str: std::marker::Sized` is not satisfied

2
src/test/compile-fail/issue-24446.rs
View file

@ -12,7 +12,7 @@ fn main() {
static foo: Fn() -> u32 = || -> u32 {
//~^ ERROR: mismatched types
//~| ERROR: `std::ops::Fn() -> u32 + 'static: std::marker::Sized` is not satisfied
//~| WARNING: This needs a `'static` lifetime or the `static_in_const` feature
0
};
}

2
src/test/compile-fail/rfc1623.rs
View file

@ -7,7 +7,7 @@
// <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.
#![feature(static_in_const)]
#![allow(dead_code)]
fn non_elidable<'a, 'b>(a: &'a u8, b: &'b u8) -> &'a u8 {

98
src/test/compile-fail/rfc1623.rs.bk
View file

@ -1,98 +0,0 @@
// 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);
struct SomeStruct<'x, 'y, 'z: 'x> {
foo: &'x Foo<'z>,
bar: &'x Bar<'z>,
f: &'y for<'a, 'b: 'a> Fn(&'a Foo<'b>) -> &'a Bar<'b>,
}
fn id<T>(t: T) -> T { t }
static SOME_STRUCT : &SomeStruct = SomeStruct {
foo: &Foo { bools: &[false, true] },
bar: &Bar { bools: &[true, true] },
f: &id,
};
// very simple test for a 'static static with default lifetime
static STATIC_STR : &'static str = "&'static str";
const CONST_STR : &'static 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 : &'static fn(&[u8]) -> &[u8] =
&(id_u8_slice as fn(&[u8]) -> &[u8]);
const CONST_SIMPLE_FN : &'static fn(&[u8]) -> &[u8] =
&(id_u8_slice as fn(&[u8]) -> &[u8]);
// this should be the same as without elision
static STATIC_NON_ELIDED_fN : &'static for<'a> fn(&'a [u8]) -> &'a [u8] =
&(id_u8_slice as for<'a> fn(&'a [u8]) -> &'a [u8]);
const CONST_NON_ELIDED_fN : &'static 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 : &'static fn(&u8, &u8, &u8) =
&(multi_args as fn(&u8, &u8, &u8));
const CONST_MULTI_FN : &'static fn(&u8, &u8, &u8) =
&(multi_args as fn(&u8, &u8, &u8));
struct Foo<'a> {
bools: &'a [bool]
}
static STATIC_FOO : Foo<'static> = Foo { bools: &[true, false] };
const CONST_FOO : Foo<'static> = Foo { bools: &[true, false] };
type Bar<'a> = Foo<'a>;
static STATIC_BAR : Bar<'static> = Bar { bools: &[true, false] };
const CONST_BAR : Bar<'static> = 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 : &'static Baz<'static> = &(baz as Baz);
const CONST_BAZ : &'static Baz<'static> = &(baz as Baz);
static BYTES : &'static [u8] = &[1, 2, 3];
fn main() {
let x = &[1u8, 2, 3];
let y = x;
//this works, so lifetime < `'static` is valid
assert_eq!(Some(1), STATIC_BAZ(y));
assert_eq!(Some(1), CONST_BAZ(y));
let y = &[1u8, 2, 3];
//^~ ERROR: borrowed values does not live long enough
STATIC_BAZ(BYTES); // BYTES has static lifetime
CONST_BAZ(y); // This forces static lifetime, which y has not
}

1
src/test/run-pass/rfc1623.rs
View file

@ -8,6 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(static_in_const)]
#![allow(dead_code)]
// very simple test for a 'static static with default lifetime

81
src/test/run-pass/rfc1623.rs.bk
View file

@ -1,81 +0,0 @@
// 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);
STATIC_BAZ(BYTES); // neees static lifetime
CONST_BAZ(BYTES);
// make sure this works with different lifetimes
let a = &1;
{
let b = &2;
let c = &3;
CONST_MULTI_FN(a, b, c);
}
}