Skip to content

Commit 10b2797

Browse files
tayloraswifttayloraswift
committed
apolitically rename Volume.Master -> Volume.Vertex for consistency with the UnidocDB collection
1 parent ae9fcbc commit 10b2797

39 files changed

+163
-163
lines changed

‎Sources/UnidocAnalysis/Volume (ext).swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ extension Volume
1010
func siteMap() -> SiteMap<PackageIdentifier>
1111
{
1212
var lines:[UInt8] = []
13-
for master:Volume.Master in self.vertices
13+
for vertex:Vertex in self.vertices
1414
{
15-
switch master
15+
switch vertex
1616
{
17-
case .culture(let master):
18-
master.shoot.serialize(into: &lines) ; lines.append(0x0A)
17+
case .culture(let vertex):
18+
vertex.shoot.serialize(into: &lines) ; lines.append(0x0A)
1919

20-
case .article(let master):
21-
master.shoot.serialize(into: &lines) ; lines.append(0x0A)
20+
case .article(let vertex):
21+
vertex.shoot.serialize(into: &lines) ; lines.append(0x0A)
2222

23-
case .decl(let master):
24-
master.shoot.serialize(into: &lines) ; lines.append(0x0A)
23+
case .decl(let vertex):
24+
vertex.shoot.serialize(into: &lines) ; lines.append(0x0A)
2525

2626
case .file, .meta:
2727
continue
@@ -37,27 +37,27 @@ extension Volume
3737
var procs:[Unidoc.Scalar: [Shoot]] = [:]
3838
var types:Types = .init()
3939

40-
for master:Master in self.vertices
40+
for vertex:Vertex in self.vertices
4141
{
42-
switch master
42+
switch vertex
4343
{
44-
case .culture(let master):
45-
modules[master.id] = master.module.id
44+
case .culture(let vertex):
45+
modules[vertex.id] = vertex.module.id
4646

47-
case .article(let master):
48-
types[master.culture, master.id] = .init(shoot: master.shoot)
47+
case .article(let vertex):
48+
types[vertex.culture, vertex.id] = .init(shoot: vertex.shoot)
4949

50-
case .decl(let master):
51-
switch master.phylum
50+
case .decl(let vertex):
51+
switch vertex.phylum
5252
{
5353
case .actor, .class, .struct, .enum, .protocol, .macro(.attached):
54-
types[master.culture, master.id] = .init(
55-
shoot: master.shoot,
56-
scope: master.scope.last)
54+
types[vertex.culture, vertex.id] = .init(
55+
shoot: vertex.shoot,
56+
scope: vertex.scope.last)
5757

5858
case .func(nil), .var(nil), .macro(.freestanding):
5959
// Global procedures show up in search, but not in the type tree.
60-
procs[master.culture, default: []].append(master.shoot)
60+
procs[vertex.culture, default: []].append(vertex.shoot)
6161

6262
case _:
6363
continue

‎Sources/UnidocDB/Volumes/UnidocDatabase.Vertices.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ extension UnidocDatabase.Vertices:DatabaseCollection
4242
$0[.collation] = UnidocDatabase.collation
4343
$0[.key] = .init
4444
{
45-
$0[Volume.Master[.zone]] = (+)
46-
$0[Volume.Master[.stem]] = (+)
47-
$0[Volume.Master[.hash]] = (+)
45+
$0[Volume.Vertex[.zone]] = (+)
46+
$0[Volume.Vertex[.stem]] = (+)
47+
$0[Volume.Vertex[.hash]] = (+)
4848
}
4949
// This limits the index to masters with a stem. This is all of them,
50-
// except for ``Volume.Master.File``.
50+
// except for ``Volume.Vertex.File``.
5151
$0[.partialFilterExpression] = .init
5252
{
53-
$0[Volume.Master[.stem]] = .init { $0[.exists] = true }
53+
$0[Volume.Vertex[.stem]] = .init { $0[.exists] = true }
5454
}
5555
},
5656
.init
@@ -61,8 +61,8 @@ extension UnidocDatabase.Vertices:DatabaseCollection
6161
$0[.collation] = UnidocDatabase.collation
6262
$0[.key] = .init
6363
{
64-
$0[Volume.Master[.hash]] = (+)
65-
$0[Volume.Master[.id]] = (+)
64+
$0[Volume.Vertex[.hash]] = (+)
65+
$0[Volume.Vertex[.id]] = (+)
6666
}
6767
},
6868
]
@@ -72,7 +72,7 @@ extension UnidocDatabase.Vertices
7272
public
7373
func recode(with session:Mongo.Session) async throws -> (modified:Int, of:Int)
7474
{
75-
try await self.recode(through: Volume.Master.self,
75+
try await self.recode(through: Volume.Vertex.self,
7676
with: session,
7777
by: .now.advanced(by: .seconds(60)))
7878
}

‎Sources/UnidocDB/Volumes/Volume.Master (ext).swift

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Sources/UnidocDB/Volumes/Volume.Vertex (ext).swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import UnidocRecords
2+
import MongoQL
3+
4+
extension Volume.Vertex:MongoMasterCodingModel
5+
{
6+
}

‎Sources/UnidocLinker/Groups/DynamicContext.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ extension DynamicContext
125125
}
126126
extension DynamicContext
127127
{
128-
func dependencies() -> [Volume.Master.Meta.Dependency]
128+
func dependencies() -> [Volume.Vertex.Meta.Dependency]
129129
{
130-
var dependencies:[Volume.Master.Meta.Dependency] = []
130+
var dependencies:[Volume.Vertex.Meta.Dependency] = []
131131
dependencies.reserveCapacity(self.current.metadata.dependencies.count + 1)
132132

133133
if self.current.metadata.package != .swift,

‎Sources/UnidocLinker/Linker/DynamicLinker.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct DynamicLinker
3030
)
3131

3232
public private(set)
33-
var vertices:[Volume.Master]
33+
var vertices:[Volume.Vertex]
3434
public private(set)
3535
var groups:[Volume.Group]
3636

@@ -83,8 +83,8 @@ extension DynamicLinker
8383

8484
self.autogroup()
8585

86-
var cultures:[Volume.Master.Culture] = self.link(clients: clients)
87-
var meta:Volume.Master.Meta = .init(id: context.current.edition.meta,
86+
var cultures:[Volume.Vertex.Culture] = self.link(clients: clients)
87+
var meta:Volume.Vertex.Meta = .init(id: context.current.edition.meta,
8888
abi: context.current.metadata.abi,
8989
dependencies: context.dependencies(),
9090
platforms: context.current.metadata.requirements,
@@ -93,7 +93,7 @@ extension DynamicLinker
9393
defer
9494
{
9595
self.vertices.append(.meta(meta))
96-
for culture:Volume.Master.Culture in cultures
96+
for culture:Volume.Vertex.Culture in cultures
9797
{
9898
self.vertices.append(.culture(culture))
9999
}
@@ -195,7 +195,7 @@ extension DynamicLinker
195195
}
196196
}
197197
private mutating
198-
func link(clients:[DynamicClientGroup]) -> [Volume.Master.Culture]
198+
func link(clients:[DynamicClientGroup]) -> [Volume.Vertex.Culture]
199199
{
200200
// First pass to create the topic records, which also populates topic memberships.
201201
for ((culture, input), clients):((Int, SymbolGraph.Culture), DynamicClientGroup)
@@ -211,7 +211,7 @@ extension DynamicLinker
211211
}
212212

213213
// Second pass to create various master records, which reads from the ``topics``.
214-
var cultures:[Volume.Master.Culture] = []
214+
var cultures:[Volume.Vertex.Culture] = []
215215
cultures.reserveCapacity(self.current.cultures.count)
216216

217217
for ((culture, input), clients):
@@ -221,7 +221,7 @@ extension DynamicLinker
221221
clients)
222222
{
223223
let namespace:ModuleIdentifier = self.current.namespaces[culture]
224-
let record:Volume.Master.Culture = self.link(culture: input,
224+
let record:Volume.Vertex.Culture = self.link(culture: input,
225225
named: namespace,
226226
at: culture,
227227
in: clients)
@@ -297,15 +297,15 @@ extension DynamicLinker
297297
func link(culture:SymbolGraph.Culture,
298298
named name:ModuleIdentifier,
299299
at index:Int,
300-
in clients:DynamicClientGroup) -> Volume.Master.Culture
300+
in clients:DynamicClientGroup) -> Volume.Vertex.Culture
301301
{
302302
let resolver:DynamicResolver = .init(context: self.context,
303303
diagnostics: self.diagnostics,
304304
namespace: name,
305305
clients: clients)
306306

307307
let scalar:Unidoc.Scalar = self.current.edition + index
308-
var record:Volume.Master.Culture = .init(id: scalar,
308+
var record:Volume.Vertex.Culture = .init(id: scalar,
309309
module: culture.module,
310310
group: self.memberships.removeValue(forKey: scalar.citizen))
311311

@@ -333,7 +333,7 @@ extension DynamicLinker
333333
self.current.articles.nodes[range])
334334
{
335335
let symbol:Symbol.Article = self.current.articles.symbols[a]
336-
var record:Volume.Master.Article = .init(id: self.current.edition + a,
336+
var record:Volume.Vertex.Article = .init(id: self.current.edition + a,
337337
stem: .init(culture.id, symbol.name),
338338
culture: self.current.edition + culture.index,
339339
file: node.body.file.map { self.current.edition + $0 },
@@ -418,7 +418,7 @@ extension DynamicLinker
418418
self.extensions[implicit].subforms.append(d)
419419
}
420420

421-
var record:Volume.Master.Decl = .init(id: d,
421+
var record:Volume.Vertex.Decl = .init(id: d,
422422
flags: .init(
423423
phylum: decl.phylum,
424424
kinks: decl.kinks,

‎Sources/UnidocPages/CanonicalVersion.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ extension CanonicalVersion
5858
let volume:URI = Site.Docs[names]
5959
let target:Target
6060

61-
if let master:Volume.Master = principal.masterInLatest
61+
if let master:Volume.Vertex = principal.masterInLatest
6262
{
6363
switch master
6464
{
@@ -91,7 +91,7 @@ extension CanonicalVersion
9191
init?(relationship:Relationship,
9292
package:String,
9393
volume:URI,
94-
master:Volume.Master,
94+
master:Volume.Vertex,
9595
in names:Volume.Names)
9696
{
9797
let target:Target

‎Sources/UnidocPages/Inlining/Inliner.Card.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ extension Inliner
1313
{
1414
let overview:Passage?
1515

16-
let master:Volume.Master
16+
let master:Volume.Vertex
1717
let target:String?
1818

19-
init(overview:Passage?, master:Volume.Master, target:String?)
19+
init(overview:Passage?, master:Volume.Vertex, target:String?)
2020
{
2121
self.overview = overview
2222
self.master = master

‎Sources/UnidocPages/Inlining/InlinerCache.Masters.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ extension InlinerCache
77
{
88
let principal:Unidoc.Scalar?
99
private(set)
10-
var secondary:[Unidoc.Scalar: Volume.Master]
10+
var secondary:[Unidoc.Scalar: Volume.Vertex]
1111

1212
init(
1313
principal:Unidoc.Scalar?,
14-
secondary:[Unidoc.Scalar: Volume.Master] = [:])
14+
secondary:[Unidoc.Scalar: Volume.Vertex] = [:])
1515
{
1616
self.principal = principal
1717
self.secondary = secondary
@@ -21,9 +21,9 @@ extension InlinerCache
2121
extension InlinerCache.Masters
2222
{
2323
mutating
24-
func add(_ masters:[Volume.Master])
24+
func add(_ masters:[Volume.Vertex])
2525
{
26-
for master:Volume.Master in masters where
26+
for master:Volume.Vertex in masters where
2727
master.id != self.principal
2828
{
2929
self.secondary[master.id] = master
@@ -32,7 +32,7 @@ extension InlinerCache.Masters
3232
}
3333
extension InlinerCache.Masters
3434
{
35-
subscript(_ scalar:Unidoc.Scalar) -> Volume.Master?
35+
subscript(_ scalar:Unidoc.Scalar) -> Volume.Vertex?
3636
{
3737
self.principal == scalar ? nil : self.secondary[scalar]
3838
}

‎Sources/UnidocPages/Inlining/InlinerCache.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extension InlinerCache
4444
}
4545
extension InlinerCache
4646
{
47-
subscript(article scalar:Unidoc.Scalar) -> (master:Volume.Master.Article, url:String?)?
47+
subscript(article scalar:Unidoc.Scalar) -> (master:Volume.Vertex.Article, url:String?)?
4848
{
4949
mutating get
5050
{
@@ -59,7 +59,7 @@ extension InlinerCache
5959
}
6060
}
6161

62-
subscript(culture scalar:Unidoc.Scalar) -> (master:Volume.Master.Culture, url:String?)?
62+
subscript(culture scalar:Unidoc.Scalar) -> (master:Volume.Vertex.Culture, url:String?)?
6363
{
6464
mutating get
6565
{
@@ -74,7 +74,7 @@ extension InlinerCache
7474
}
7575
}
7676

77-
subscript(decl scalar:Unidoc.Scalar) -> (master:Volume.Master.Decl, url:String?)?
77+
subscript(decl scalar:Unidoc.Scalar) -> (master:Volume.Vertex.Decl, url:String?)?
7878
{
7979
mutating get
8080
{
@@ -90,7 +90,7 @@ extension InlinerCache
9090
}
9191

9292
subscript(file scalar:Unidoc.Scalar,
93-
line line:Int? = nil) -> (master:Volume.Master.File, url:String?)?
93+
line line:Int? = nil) -> (master:Volume.Vertex.File, url:String?)?
9494
{
9595
mutating get
9696
{
@@ -110,13 +110,13 @@ extension InlinerCache
110110
}
111111
}
112112

113-
subscript(scalar:Unidoc.Scalar) -> (master:Volume.Master, url:String?)?
113+
subscript(scalar:Unidoc.Scalar) -> (master:Volume.Vertex, url:String?)?
114114
{
115115
mutating get
116116
{
117117
self.masters[scalar].map
118118
{
119-
(master:Volume.Master) in
119+
(master:Volume.Vertex) in
120120
(master, self.load(scalar) { .init(master: master, in: $0) })
121121
}
122122
}

0 commit comments

Comments
 (0)