Skip to content

Commit 2ea057e

Browse files
committed
Clarify lifetimes
Addresses several warnings on nightly rustc.
1 parent 7426fcc commit 2ea057e

File tree

22 files changed

+39
-35
lines changed

22 files changed

+39
-35
lines changed

godot-core/src/builtin/callable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ impl Callable {
448448
}
449449

450450
#[doc(hidden)]
451-
pub fn as_inner(&self) -> inner::InnerCallable {
451+
pub fn as_inner(&self) -> inner::InnerCallable<'_> {
452452
inner::InnerCallable::from_outer(self)
453453
}
454454
}

godot-core/src/builtin/collections/array.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,12 +910,12 @@ impl<T: ArrayElement> Array<T> {
910910
/// In particular this means that all reads are fine, since all values can be converted to `Variant`. However, writes are only OK
911911
/// if they match the type `T`.
912912
#[doc(hidden)]
913-
pub unsafe fn as_inner_mut(&self) -> inner::InnerArray {
913+
pub unsafe fn as_inner_mut(&self) -> inner::InnerArray<'_> {
914914
// The memory layout of `Array<T>` does not depend on `T`.
915915
inner::InnerArray::from_outer_typed(self)
916916
}
917917

918-
fn as_inner(&self) -> ImmutableInnerArray {
918+
fn as_inner(&self) -> ImmutableInnerArray<'_> {
919919
ImmutableInnerArray {
920920
// SAFETY: We can only read from the array.
921921
inner: unsafe { self.as_inner_mut() },

godot-core/src/builtin/collections/dictionary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ impl Dictionary {
365365
}
366366

367367
#[doc(hidden)]
368-
pub fn as_inner(&self) -> inner::InnerDictionary {
368+
pub fn as_inner(&self) -> inner::InnerDictionary<'_> {
369369
inner::InnerDictionary::from_outer(self)
370370
}
371371

godot-core/src/builtin/color.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ impl Color {
350350
&& self.a <= 1.0
351351
}
352352

353-
fn as_inner(&self) -> InnerColor {
353+
fn as_inner(&self) -> InnerColor<'_> {
354354
InnerColor::from_outer(self)
355355
}
356356
}

godot-core/src/builtin/projection.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
use godot_ffi as sys;
99
use sys::{ffi_methods, ExtVariantType, GodotFfi};
1010

11-
use crate::builtin::inner::InnerProjection;
1211
use crate::builtin::math::{ApproxEq, GlamConv, GlamType};
13-
use crate::builtin::{real, Plane, RMat4, RealConv, Transform3D, Vector2, Vector4, Vector4Axis};
12+
use crate::builtin::{
13+
inner, real, Plane, RMat4, RealConv, Transform3D, Vector2, Vector4, Vector4Axis,
14+
};
1415

1516
use std::ops::Mul;
1617

@@ -470,8 +471,8 @@ impl Projection {
470471
}
471472

472473
#[doc(hidden)]
473-
pub(crate) fn as_inner(&self) -> InnerProjection {
474-
InnerProjection::from_outer(self)
474+
pub(crate) fn as_inner(&self) -> inner::InnerProjection<'_> {
475+
inner::InnerProjection::from_outer(self)
475476
}
476477
}
477478

godot-core/src/builtin/quaternion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ impl Quaternion {
259259
}
260260

261261
#[doc(hidden)]
262-
pub fn as_inner(&self) -> inner::InnerQuaternion {
262+
pub fn as_inner(&self) -> inner::InnerQuaternion<'_> {
263263
inner::InnerQuaternion::from_outer(self)
264264
}
265265

godot-core/src/builtin/signal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl Signal {
158158
}
159159

160160
#[doc(hidden)]
161-
pub fn as_inner(&self) -> inner::InnerSignal {
161+
pub fn as_inner(&self) -> inner::InnerSignal<'_> {
162162
inner::InnerSignal::from_outer(self)
163163
}
164164
}

godot-core/src/builtin/string/gstring.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ impl GString {
257257
}
258258

259259
#[doc(hidden)]
260-
pub fn as_inner(&self) -> inner::InnerString {
260+
pub fn as_inner(&self) -> inner::InnerString<'_> {
261261
inner::InnerString::from_outer(self)
262262
}
263263
}

godot-core/src/builtin/string/node_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ impl NodePath {
180180
}
181181

182182
#[doc(hidden)]
183-
pub fn as_inner(&self) -> inner::InnerNodePath {
183+
pub fn as_inner(&self) -> inner::InnerNodePath<'_> {
184184
inner::InnerNodePath::from_outer(self)
185185
}
186186
}

godot-core/src/builtin/string/string_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ impl StringName {
247247
}
248248

249249
#[doc(hidden)]
250-
pub fn as_inner(&self) -> inner::InnerStringName {
250+
pub fn as_inner(&self) -> inner::InnerStringName<'_> {
251251
inner::InnerStringName::from_outer(self)
252252
}
253253

0 commit comments

Comments
 (0)