Skip to contentSkip to conversation

rust: types: Make Opaque::get const

PATCH Applied Boqun Feng 5 participants 5 messages Apr 1, 2024 – May 5, 2024 Rust

lore
Share & tools
lore

Boqun Feng

author
#0 lore raw

PATCH 1/1 rust: types: Make Opaque::get const

To support a potential usage:

    static foo: Opaque<Foo> = ..; // Or defined in an extern block.

    ...

    fn bar() {
        let ptr = foo.get();
    }

Opaque::get need to be const, otherwise compiler will complain because calls on statics are limited to const functions.

Also Opaque::get should be naturally const since it's a composition of two const functions: UnsafeCell::get and ptr::cast.

---
 rust/kernel/types.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
rust/kernel/types.rs +1 -1
index 0949f9971074..25953c8f8acf 100644
@@ -315,7 +315,7 @@ pub fn ffi_init(init_func: impl FnOnce(*mut T)) -> impl PinInit<Self> {
     }
 
     /// Returns a raw pointer to the opaque data.
-    pub fn get(&self) -> *mut T {
+    pub const fn get(&self) -> *mut T {
         UnsafeCell::get(&self.value).cast::<T>()
     }
 
Signature · 1 line
2.44.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Boqun Feng

To support a potential usage:

    static foo: Opaque<Foo> = ..; // Or defined in an extern block.

    ...

    fn bar() {
        let ptr = foo.get();
    }
Quoted 7 lines

Opaque::get need to be const, otherwise compiler will complain because calls on statics are limited to const functions.

Also Opaque::get should be naturally const since it's a composition of two const functions: UnsafeCell::get and ptr::cast.

reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Boqun Feng
Quoted 11 lines · Boqun Feng

To support a potential usage:

    static foo: Opaque<Foo> = ..; // Or defined in an extern block.

    ...

    fn bar() {
        let ptr = foo.get();
    }
Quoted 7 lines

Opaque::get need to be const, otherwise compiler will complain because calls on statics are limited to const functions.

Also Opaque::get should be naturally const since it's a composition of two const functions: UnsafeCell::get and ptr::cast.

Reviewed-by on v1 1/1
#3 lore raw
In reply to Boqun Feng
Quoted 13 lines · Boqun Feng

To support a potential usage:

     static foo: Opaque<Foo> = ..; // Or defined in an extern block.

     ...

     fn bar() {
         let ptr = foo.get();
     }

Opaque::get need to be const, otherwise compiler will complain because calls on statics are limited to const functions.

Quoted 7 lines

Also Opaque::get should be naturally const since it's a composition of two const functions: UnsafeCell::get and ptr::cast.

---
  rust/kernel/types.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 2 lines
Cheers,
Benno
Applied
#4 lore raw
In reply to Boqun Feng
Quoted 11 lines · Boqun Feng

To support a potential usage:

    static foo: Opaque<Foo> = ..; // Or defined in an extern block.

    ...

    fn bar() {
        let ptr = foo.get();
    }
Quoted 7 lines

Opaque::get need to be const, otherwise compiler will complain because calls on statics are limited to const functions.

Also Opaque::get should be naturally const since it's a composition of two const functions: UnsafeCell::get and ptr::cast.

Applied to rust-next -- thanks everyone!

Cheers,
Miguel