Skip to content

Commit fa1ac0e

Browse files
bors[bot]toasteater
and
toasteater
authored
Merge #686
686: Fix bounds in RefKindSpec trait r=toasteater a=toasteater A [rustc regression](rust-lang/rust#79904) in the latest stable version as of writing (1.49.0) caused this to sneak past CI. This should let the library compile again. A test using rustc 1.46.0 is added, but this is not a commitment of minimum compiler version. Co-authored-by: toasteater <48371905+toasteater@users.noreply.github.com>
2 parents 7b23560 + d216a7f commit fa1ac0e

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

.github/workflows/ci.yml

+12
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,17 @@ jobs:
102102
if: ${{ matrix.is_windows }}
103103
run: cargo build --target x86_64-pc-windows-msvc --release;
104104

105+
rustc-1-46:
106+
needs: rustfmt
107+
runs-on: ubuntu-latest
108+
steps:
109+
- uses: actions/checkout@v2
110+
- uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f
111+
with:
112+
toolchain: 1.46.0
113+
- name: Checking on 1.46.0
114+
run: cargo +1.46.0 check --all --all-features;
115+
105116
test_ios:
106117
continue-on-error: ${{ matrix.experimental }}
107118
needs: rustfmt
@@ -260,6 +271,7 @@ jobs:
260271
- clippy
261272
- rustfmt
262273
- test
274+
- rustc-1-46
263275
- test_ios
264276
- test_android
265277
- godot_test

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.9.3] - 2020-02-02
9+
10+
### Fixed
11+
12+
- **The code now compiles on rustc versions not affected by https://github.com/rust-lang/rust/issues/79904**
13+
814
## [0.9.2] - 2020-02-01
915

1016
### Added

gdnative-core/src/object.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,9 @@ pub trait RefKindSpec: Sized {
11561156
#[doc(hidden)]
11571157
unsafe fn impl_from_maybe_ref_counted<T: GodotObject<RefKind = Self>>(
11581158
ptr: NonNull<sys::godot_object>,
1159-
) -> Option<Ref<T, Unique>>;
1159+
) -> Option<Ref<T, Unique>>
1160+
where
1161+
Self: RefKind;
11601162

11611163
#[doc(hidden)]
11621164
unsafe fn impl_assume_safe<'a, T: GodotObject<RefKind = Self>>(

0 commit comments

Comments
 (0)