forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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"`
- Loading branch information
Tim
committed
Feb 28, 2019
1 parent
7e001e5
commit 797d8ea
Showing
7 changed files
with
97 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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())); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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())); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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`. |