Delete LanePriority type (#21090)
No longer using LanePriority anywhere, so this deletes the remaining references.
Andrew Clark committed
Mar 28, 2021 at 16:07 UTC
46b68eaf626f924093952125bd75ba16df0fe204
2 files changed
-114
packages/react-reconciler/src/ReactFiberLane.new.js
-57
@@ -37,28 +37,6 @@ export type LaneMap<T> = Array<T>;
37
38
import {enableCache, enableSchedulingProfiler} from 'shared/ReactFeatureFlags';
39
40
-export const SyncLanePriority: LanePriority = 12;
41
-
42
-const InputContinuousHydrationLanePriority: LanePriority = 11;
43
-export const InputContinuousLanePriority: LanePriority = 10;
44
-
45
-const DefaultHydrationLanePriority: LanePriority = 9;
46
-export const DefaultLanePriority: LanePriority = 8;
47
-
48
-const TransitionHydrationPriority: LanePriority = 7;
49
-export const TransitionPriority: LanePriority = 6;
50
-
51
-const RetryLanePriority: LanePriority = 5;
52
-
53
-const SelectiveHydrationLanePriority: LanePriority = 4;
54
-
55
-const IdleHydrationLanePriority: LanePriority = 3;
56
-export const IdleLanePriority: LanePriority = 2;
57
-
58
-const OffscreenLanePriority: LanePriority = 1;
59
-
60
-export const NoLanePriority: LanePriority = 0;
61
-
40
// Lane values below should be kept in sync with getLabelsForLanes(), used by react-devtools-scheduling-profiler.
41
// If those values are changed that package should be rebuilt and redeployed.
42
@@ -162,29 +140,19 @@ export const NoTimestamp = -1;
140
let nextTransitionLane: Lane = TransitionLane1;
141
let nextRetryLane: Lane = RetryLane1;
142
165
-// "Registers" used to "return" multiple values
166
-// Used by getHighestPriorityLanes and getNextLanes:
167
-let return_highestLanePriority: LanePriority = DefaultLanePriority;
168
-
143
function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
144
switch (getHighestPriorityLane(lanes)) {
145
case SyncLane:
172
- return_highestLanePriority = SyncLanePriority;
146
return SyncLane;
147
case InputContinuousHydrationLane:
175
- return_highestLanePriority = InputContinuousHydrationLanePriority;
148
return InputContinuousHydrationLane;
149
case InputContinuousLane:
178
- return_highestLanePriority = InputContinuousLanePriority;
150
return InputContinuousLane;
151
case DefaultHydrationLane:
181
- return_highestLanePriority = DefaultHydrationLanePriority;
152
return DefaultHydrationLane;
153
case DefaultLane:
184
- return_highestLanePriority = DefaultLanePriority;
154
return DefaultLane;
155
case TransitionHydrationLane:
187
- return_highestLanePriority = TransitionHydrationPriority;
156
return TransitionHydrationLane;
157
case TransitionLane1:
158
case TransitionLane2:
@@ -202,26 +170,20 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
170
case TransitionLane14:
171
case TransitionLane15:
172
case TransitionLane16:
205
- return_highestLanePriority = TransitionPriority;
173
return lanes & TransitionLanes;
174
case RetryLane1:
175
case RetryLane2:
176
case RetryLane3:
177
case RetryLane4:
178
case RetryLane5:
212
- return_highestLanePriority = RetryLanePriority;
179
return lanes & RetryLanes;
180
case SelectiveHydrationLane:
215
- return_highestLanePriority = SelectiveHydrationLanePriority;
181
return SelectiveHydrationLane;
182
case IdleHydrationLane:
218
- return_highestLanePriority = IdleHydrationLanePriority;
183
return IdleHydrationLane;
184
case IdleLane:
221
- return_highestLanePriority = IdleLanePriority;
185
return IdleLane;
186
case OffscreenLane:
224
- return_highestLanePriority = OffscreenLanePriority;
187
return OffscreenLane;
188
default:
189
if (__DEV__) {
@@ -230,7 +192,6 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
192
);
193
}
194
// This shouldn't be reachable, but as a fallback, return the entire bitmask.
233
- return_highestLanePriority = DefaultLanePriority;
195
return lanes;
196
}
197
}
@@ -239,12 +200,10 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
200
// Early bailout if there's no pending work left.
201
const pendingLanes = root.pendingLanes;
202
if (pendingLanes === NoLanes) {
242
- return_highestLanePriority = NoLanePriority;
203
return NoLanes;
204
}
205
206
let nextLanes = NoLanes;
247
- let nextLanePriority = NoLanePriority;
207
208
const suspendedLanes = root.suspendedLanes;
209
const pingedLanes = root.pingedLanes;
@@ -256,12 +215,10 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
215
const nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
216
if (nonIdleUnblockedLanes !== NoLanes) {
217
nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
259
- nextLanePriority = return_highestLanePriority;
218
} else {
219
const nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
220
if (nonIdlePingedLanes !== NoLanes) {
221
nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
264
- nextLanePriority = return_highestLanePriority;
222
}
223
}
224
} else {
@@ -269,11 +226,9 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
226
const unblockedLanes = pendingLanes & ~suspendedLanes;
227
if (unblockedLanes !== NoLanes) {
228
nextLanes = getHighestPriorityLanes(unblockedLanes);
272
- nextLanePriority = return_highestLanePriority;
229
} else {
230
if (pingedLanes !== NoLanes) {
231
nextLanes = getHighestPriorityLanes(pingedLanes);
276
- nextLanePriority = return_highestLanePriority;
232
}
233
}
234
}
@@ -307,8 +262,6 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
262
) {
263
// Keep working on the existing in-progress tree. Do not interrupt.
264
return wipLanes;
310
- } else {
311
- return_highestLanePriority = nextLanePriority;
265
}
266
}
267
@@ -490,9 +443,6 @@ export function getLanesToRetrySynchronouslyOnError(root: FiberRoot): Lanes {
443
return NoLanes;
444
}
445
493
-export function returnNextLanesPriority() {
494
- return return_highestLanePriority;
495
-}
446
export function includesNonIdleWork(lanes: Lanes) {
447
return (lanes & NonIdleLanes) !== NoLanes;
448
}
@@ -579,13 +529,6 @@ export function higherPriorityLane(a: Lane, b: Lane) {
529
return a !== NoLane && a < b ? a : b;
530
}
531
582
-export function higherLanePriority(
583
- a: LanePriority,
584
- b: LanePriority,
585
-): LanePriority {
586
- return a !== NoLanePriority && a > b ? a : b;
587
-}
588
-
532
export function createLaneMap<T>(initial: T): LaneMap<T> {
533
// Intentionally pushing one by one.
534
// https://v8.dev/blog/elements-kinds#avoid-creating-holes
packages/react-reconciler/src/ReactFiberLane.old.js
-57
@@ -37,28 +37,6 @@ export type LaneMap<T> = Array<T>;
37
38
import {enableCache, enableSchedulingProfiler} from 'shared/ReactFeatureFlags';
39
40
-export const SyncLanePriority: LanePriority = 12;
41
-
42
-const InputContinuousHydrationLanePriority: LanePriority = 11;
43
-export const InputContinuousLanePriority: LanePriority = 10;
44
-
45
-const DefaultHydrationLanePriority: LanePriority = 9;
46
-export const DefaultLanePriority: LanePriority = 8;
47
-
48
-const TransitionHydrationPriority: LanePriority = 7;
49
-export const TransitionPriority: LanePriority = 6;
50
-
51
-const RetryLanePriority: LanePriority = 5;
52
-
53
-const SelectiveHydrationLanePriority: LanePriority = 4;
54
-
55
-const IdleHydrationLanePriority: LanePriority = 3;
56
-export const IdleLanePriority: LanePriority = 2;
57
-
58
-const OffscreenLanePriority: LanePriority = 1;
59
-
60
-export const NoLanePriority: LanePriority = 0;
61
-
40
// Lane values below should be kept in sync with getLabelsForLanes(), used by react-devtools-scheduling-profiler.
41
// If those values are changed that package should be rebuilt and redeployed.
42
@@ -162,29 +140,19 @@ export const NoTimestamp = -1;
140
let nextTransitionLane: Lane = TransitionLane1;
141
let nextRetryLane: Lane = RetryLane1;
142
165
-// "Registers" used to "return" multiple values
166
-// Used by getHighestPriorityLanes and getNextLanes:
167
-let return_highestLanePriority: LanePriority = DefaultLanePriority;
168
-
143
function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
144
switch (getHighestPriorityLane(lanes)) {
145
case SyncLane:
172
- return_highestLanePriority = SyncLanePriority;
146
return SyncLane;
147
case InputContinuousHydrationLane:
175
- return_highestLanePriority = InputContinuousHydrationLanePriority;
148
return InputContinuousHydrationLane;
149
case InputContinuousLane:
178
- return_highestLanePriority = InputContinuousLanePriority;
150
return InputContinuousLane;
151
case DefaultHydrationLane:
181
- return_highestLanePriority = DefaultHydrationLanePriority;
152
return DefaultHydrationLane;
153
case DefaultLane:
184
- return_highestLanePriority = DefaultLanePriority;
154
return DefaultLane;
155
case TransitionHydrationLane:
187
- return_highestLanePriority = TransitionHydrationPriority;
156
return TransitionHydrationLane;
157
case TransitionLane1:
158
case TransitionLane2:
@@ -202,26 +170,20 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
170
case TransitionLane14:
171
case TransitionLane15:
172
case TransitionLane16:
205
- return_highestLanePriority = TransitionPriority;
173
return lanes & TransitionLanes;
174
case RetryLane1:
175
case RetryLane2:
176
case RetryLane3:
177
case RetryLane4:
178
case RetryLane5:
212
- return_highestLanePriority = RetryLanePriority;
179
return lanes & RetryLanes;
180
case SelectiveHydrationLane:
215
- return_highestLanePriority = SelectiveHydrationLanePriority;
181
return SelectiveHydrationLane;
182
case IdleHydrationLane:
218
- return_highestLanePriority = IdleHydrationLanePriority;
183
return IdleHydrationLane;
184
case IdleLane:
221
- return_highestLanePriority = IdleLanePriority;
185
return IdleLane;
186
case OffscreenLane:
224
- return_highestLanePriority = OffscreenLanePriority;
187
return OffscreenLane;
188
default:
189
if (__DEV__) {
@@ -230,7 +192,6 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
192
);
193
}
194
// This shouldn't be reachable, but as a fallback, return the entire bitmask.
233
- return_highestLanePriority = DefaultLanePriority;
195
return lanes;
196
}
197
}
@@ -239,12 +200,10 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
200
// Early bailout if there's no pending work left.
201
const pendingLanes = root.pendingLanes;
202
if (pendingLanes === NoLanes) {
242
- return_highestLanePriority = NoLanePriority;
203
return NoLanes;
204
}
205
206
let nextLanes = NoLanes;
247
- let nextLanePriority = NoLanePriority;
207
208
const suspendedLanes = root.suspendedLanes;
209
const pingedLanes = root.pingedLanes;
@@ -256,12 +215,10 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
215
const nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
216
if (nonIdleUnblockedLanes !== NoLanes) {
217
nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
259
- nextLanePriority = return_highestLanePriority;
218
} else {
219
const nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
220
if (nonIdlePingedLanes !== NoLanes) {
221
nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
264
- nextLanePriority = return_highestLanePriority;
222
}
223
}
224
} else {
@@ -269,11 +226,9 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
226
const unblockedLanes = pendingLanes & ~suspendedLanes;
227
if (unblockedLanes !== NoLanes) {
228
nextLanes = getHighestPriorityLanes(unblockedLanes);
272
- nextLanePriority = return_highestLanePriority;
229
} else {
230
if (pingedLanes !== NoLanes) {
231
nextLanes = getHighestPriorityLanes(pingedLanes);
276
- nextLanePriority = return_highestLanePriority;
232
}
233
}
234
}
@@ -307,8 +262,6 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
262
) {
263
// Keep working on the existing in-progress tree. Do not interrupt.
264
return wipLanes;
310
- } else {
311
- return_highestLanePriority = nextLanePriority;
265
}
266
}
267
@@ -490,9 +443,6 @@ export function getLanesToRetrySynchronouslyOnError(root: FiberRoot): Lanes {
443
return NoLanes;
444
}
445
493
-export function returnNextLanesPriority() {
494
- return return_highestLanePriority;
495
-}
446
export function includesNonIdleWork(lanes: Lanes) {
447
return (lanes & NonIdleLanes) !== NoLanes;
448
}
@@ -579,13 +529,6 @@ export function higherPriorityLane(a: Lane, b: Lane) {
529
return a !== NoLane && a < b ? a : b;
530
}
531
582
-export function higherLanePriority(
583
- a: LanePriority,
584
- b: LanePriority,
585
-): LanePriority {
586
- return a !== NoLanePriority && a > b ? a : b;
587
-}
588
-
532
export function createLaneMap<T>(initial: T): LaneMap<T> {
533
// Intentionally pushing one by one.
534
// https://v8.dev/blog/elements-kinds#avoid-creating-holes