Skip to content

Commit de2b9d2

Browse files
committed
servo: Merge #1326 - s/FlowContext/Flow (from brunoabinader:rename-flowcontext); r=pcwalton
This patch is for: servo/servo#1282 Source-Repo: https://github.com/servo/servo Source-Revision: a0c6075b4d766da8f0414405f9e1f76c8c90acc4 UltraBlame original commit: c19897ea35f82925d59433fa208ad8c562ed53f6
1 parent f48993a commit de2b9d2

File tree

7 files changed

+62
-62
lines changed

7 files changed

+62
-62
lines changed

servo/src/components/main/layout/block.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ flow
106106
{
107107
BlockFlowClass
108108
FlowClass
109-
FlowContext
109+
Flow
110110
FlowData
111111
ImmutableFlowUtils
112112
}
@@ -2465,7 +2465,7 @@ false
24652465
}
24662466
}
24672467
impl
2468-
FlowContext
2468+
Flow
24692469
for
24702470
BlockFlow
24712471
{

servo/src/components/main/layout/construct.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ flow
418418
:
419419
:
420420
{
421-
FlowContext
421+
Flow
422422
FlowData
423423
MutableFlowUtils
424424
}
@@ -627,7 +627,7 @@ node
627627
FlowConstructionResult
628628
(
629629
~
630-
FlowContext
630+
Flow
631631
:
632632
)
633633
/
@@ -707,7 +707,7 @@ until
707707
they
708708
find
709709
a
710-
FlowContext
710+
Flow
711711
to
712712
be
713713
/
@@ -1032,7 +1032,7 @@ split
10321032
flow
10331033
:
10341034
~
1035-
FlowContext
1035+
Flow
10361036
:
10371037
}
10381038
/
@@ -2069,7 +2069,7 @@ flow
20692069
&
20702070
mut
20712071
~
2072-
FlowContext
2072+
Flow
20732073
:
20742074
node
20752075
:
@@ -2119,7 +2119,7 @@ boxes
21192119
)
21202120
as
21212121
~
2122-
FlowContext
2122+
Flow
21232123
:
21242124
;
21252125
TextRunScanner
@@ -2195,7 +2195,7 @@ flow
21952195
&
21962196
mut
21972197
~
2198-
FlowContext
2198+
Flow
21992199
:
22002200
node
22012201
:
@@ -2297,7 +2297,7 @@ flow
22972297
&
22982298
mut
22992299
~
2300-
FlowContext
2300+
Flow
23012301
:
23022302
node
23032303
:
@@ -2762,7 +2762,7 @@ LayoutView
27622762
-
27632763
>
27642764
~
2765-
FlowContext
2765+
Flow
27662766
:
27672767
{
27682768
let
@@ -2806,7 +2806,7 @@ box
28062806
)
28072807
as
28082808
~
2809-
FlowContext
2809+
Flow
28102810
:
28112811
;
28122812
self
@@ -2870,7 +2870,7 @@ FloatType
28702870
-
28712871
>
28722872
~
2873-
FlowContext
2873+
Flow
28742874
:
28752875
{
28762876
let
@@ -2915,7 +2915,7 @@ box
29152915
)
29162916
as
29172917
~
2918-
FlowContext
2918+
Flow
29192919
:
29202920
;
29212921
self

servo/src/components/main/layout/float.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ flow
9999
{
100100
FloatFlowClass
101101
FlowClass
102-
FlowContext
102+
Flow
103103
FlowData
104104
}
105105
;
@@ -653,7 +653,7 @@ FloatFlow
653653
}
654654
}
655655
impl
656-
FlowContext
656+
Flow
657657
for
658658
FloatFlow
659659
{

0 commit comments

Comments
 (0)