Skip to content

Commit fbc5ebe

Browse files
bors[bot]bradjc
andauthored
Merge #3391
3391: kernel: sched: mlfq r=hudson-ayers a=bradjc ### Pull Request Overview I updated the Rust compiler to a February 2023 nightly, and encountered build errors. Specifically: ``` error: impl method assumes more implied bounds than the corresponding trait method --> kernel/src/scheduler/mlfq.rs:54:26 | 54 | fn next(&'a self) -> &'static ListLink<'a, MLFQProcessNode<'a>> { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace this type to make the impl signature compatible: `&'a ListLink<'a, MLFQProcessNode<'a>>` | = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #105572 <rust-lang/rust#105572> = note: `#[deny(implied_bounds_entailment)]` on by default ``` This implements the proposed change. We need to fix this before we will be able to update to a new nightly. However, this seemed perhaps more substantial that the typical fixes needed to update nightlies, so I thought it was worth making a dedicated PR. ### Testing Strategy compiling ### TODO or Help Wanted n/a ### Documentation Updated - [x] Updated the relevant files in `/docs`, or no updates are required. ### Formatting - [x] Ran `make prepush`. Co-authored-by: Brad Campbell <[email protected]>
2 parents 8538bd6 + 7b0a7a9 commit fbc5ebe

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/src/scheduler/mlfq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl<'a> MLFQProcessNode<'a> {
5151
}
5252

5353
impl<'a> ListNode<'a, MLFQProcessNode<'a>> for MLFQProcessNode<'a> {
54-
fn next(&'a self) -> &'static ListLink<'a, MLFQProcessNode<'a>> {
54+
fn next(&'a self) -> &'a ListLink<'a, MLFQProcessNode<'a>> {
5555
&self.next
5656
}
5757
}

0 commit comments

Comments
 (0)