diff options
| author | Tim <t.diekmann.3dv@gmail.com> | 2019-02-28 07:32:13 +0100 |
|---|---|---|
| committer | Tim <t.diekmann.3dv@gmail.com> | 2019-02-28 07:32:13 +0100 |
| commit | 797d8ea4789c64bb20869fa7fb0c15e2c09432cf (patch) | |
| tree | ff34a53df2421ef0eb7d617dba224eed0e09f28f /src/test | |
| parent | 7e001e5c6c7c090b41416a57d4be412ed3ccd937 (diff) | |
| download | rust-797d8ea4789c64bb20869fa7fb0c15e2c09432cf.tar.gz rust-797d8ea4789c64bb20869fa7fb0c15e2c09432cf.zip | |
Make `Unique::as_ptr`, `NonNull::dangling` and `NonNull::cast` const
Make `Unique::as_ptr` const without feature attribute as it's unstable Make `NonNull::dangling` and `NonNull::cast` const with `feature = "const_ptr_nonnull"`
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/consts/const-ptr-nonnull.rs | 17 | ||||
| -rw-r--r-- | src/test/run-pass/consts/const-ptr-unique.rs | 15 | ||||
| -rw-r--r-- | src/test/ui/consts/const-ptr-nonnull.rs | 11 | ||||
| -rw-r--r-- | src/test/ui/consts/const-ptr-nonnull.stderr | 25 | ||||
| -rw-r--r-- | src/test/ui/consts/const-ptr-unique.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/consts/const-ptr-unique.stderr | 14 |
6 files changed, 92 insertions, 0 deletions
diff --git a/src/test/run-pass/consts/const-ptr-nonnull.rs b/src/test/run-pass/consts/const-ptr-nonnull.rs new file mode 100644 index 00000000000..91624e92fbe --- /dev/null +++ b/src/test/run-pass/consts/const-ptr-nonnull.rs @@ -0,0 +1,17 @@ +// run-pass + +#![feature(const_ptr_nonnull)] + +use std::ptr::NonNull; + +const DANGLING: NonNull<u32> = NonNull::dangling(); +const CASTED: NonNull<u32> = NonNull::cast(NonNull::<i32>::dangling()); + +fn ident<T>(ident: T) -> T { + ident +} + +pub fn main() { + assert_eq!(DANGLING, ident(NonNull::dangling())); + assert_eq!(CASTED, ident(NonNull::dangling())); +} diff --git a/src/test/run-pass/consts/const-ptr-unique.rs b/src/test/run-pass/consts/const-ptr-unique.rs new file mode 100644 index 00000000000..eb371ab1841 --- /dev/null +++ b/src/test/run-pass/consts/const-ptr-unique.rs @@ -0,0 +1,15 @@ +// run-pass + +#![feature(ptr_internals)] + +use std::ptr::Unique; + +const PTR: *mut u32 = Unique::empty().as_ptr(); + +fn ident<T>(ident: T) -> T { + ident +} + +pub fn main() { + assert_eq!(PTR, ident(Unique::<u32>::empty().as_ptr())); +} diff --git a/src/test/ui/consts/const-ptr-nonnull.rs b/src/test/ui/consts/const-ptr-nonnull.rs new file mode 100644 index 00000000000..54e743aa32e --- /dev/null +++ b/src/test/ui/consts/const-ptr-nonnull.rs @@ -0,0 +1,11 @@ +use std::ptr::NonNull; + +fn main() { + let x: &'static NonNull<u32> = &(NonNull::dangling()); + //~^ ERROR borrowed value does not live long enough + + let mut i: i32 = 10; + let non_null = NonNull::new(&mut i).unwrap(); + let x: &'static NonNull<u32> = &(non_null.cast()); + //~^ ERROR borrowed value does not live long enough +} diff --git a/src/test/ui/consts/const-ptr-nonnull.stderr b/src/test/ui/consts/const-ptr-nonnull.stderr new file mode 100644 index 00000000000..a9476dda6d3 --- /dev/null +++ b/src/test/ui/consts/const-ptr-nonnull.stderr @@ -0,0 +1,25 @@ +error[E0597]: borrowed value does not live long enough + --> $DIR/const-ptr-nonnull.rs:4:37 + | +LL | let x: &'static NonNull<u32> = &(NonNull::dangling()); + | ^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough +... +LL | } + | - temporary value only lives until here + | + = note: borrowed value must be valid for the static lifetime... + +error[E0597]: borrowed value does not live long enough + --> $DIR/const-ptr-nonnull.rs:9:37 + | +LL | let x: &'static NonNull<u32> = &(non_null.cast()); + | ^^^^^^^^^^^^^^^^^ temporary value does not live long enough +LL | //~^ ERROR borrowed value does not live long enough +LL | } + | - temporary value only lives until here + | + = note: borrowed value must be valid for the static lifetime... + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0597`. diff --git a/src/test/ui/consts/const-ptr-unique.rs b/src/test/ui/consts/const-ptr-unique.rs new file mode 100644 index 00000000000..be44a241816 --- /dev/null +++ b/src/test/ui/consts/const-ptr-unique.rs @@ -0,0 +1,10 @@ +#![feature(ptr_internals)] + +use std::ptr::Unique; + +fn main() { + let mut i: u32 = 10; + let unique = Unique::new(&mut i).unwrap(); + let x: &'static *mut u32 = &(unique.as_ptr()); + //~^ ERROR borrowed value does not live long enough +} diff --git a/src/test/ui/consts/const-ptr-unique.stderr b/src/test/ui/consts/const-ptr-unique.stderr new file mode 100644 index 00000000000..141465bf184 --- /dev/null +++ b/src/test/ui/consts/const-ptr-unique.stderr @@ -0,0 +1,14 @@ +error[E0597]: borrowed value does not live long enough + --> $DIR/const-ptr-unique.rs:8:33 + | +LL | let x: &'static *mut u32 = &(unique.as_ptr()); + | ^^^^^^^^^^^^^^^^^ temporary value does not live long enough +LL | //~^ ERROR borrowed value does not live long enough +LL | } + | - temporary value only lives until here + | + = note: borrowed value must be valid for the static lifetime... + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0597`. |
