Skip to content

Commit 13659a7

Browse files
wksmmtkgc-bot
andauthored
Rename edge to slot (#85)
Parent PR: mmtk/mmtk-core#1134 --------- Co-authored-by: mmtkgc-bot <[email protected]>
1 parent 6a90d22 commit 13659a7

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

mmtk/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ log = "*"
2727
# - change branch
2828
# - change repo name
2929
# But other changes including adding/removing whitespaces in commented lines may break the CI.
30-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a02803b4104519ff2289234101a2dd8ceedd1bc7" }
30+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "56b2521d2b99848ee0613a0a5288fe6d81b754ba" }
3131
# Uncomment the following and fix the path to mmtk-core to build locally
3232
# mmtk = { path = "../repos/mmtk-core" }
3333

mmtk/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub struct V8;
5151
///
5252
/// TODO: We start with Address to transition from the old API.
5353
/// We should define an edge type suitable for V8.
54-
pub type V8Edge = Address;
54+
pub type V8Slot = Address;
5555

5656
impl VMBinding for V8 {
5757
type VMObjectModel = object_model::VMObjectModel;
@@ -60,8 +60,8 @@ impl VMBinding for V8 {
6060
type VMActivePlan = active_plan::VMActivePlan;
6161
type VMReferenceGlue = reference_glue::VMReferenceGlue;
6262

63-
type VMEdge = V8Edge;
64-
type VMMemorySlice = mmtk::vm::edge_shape::UnimplementedMemorySlice<V8Edge>;
63+
type VMSlot = V8Slot;
64+
type VMMemorySlice = mmtk::vm::slot::UnimplementedMemorySlice<V8Slot>;
6565

6666
const MAX_ALIGNMENT: usize = 32;
6767
}

mmtk/src/scanning.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
use mmtk::util::opaque_pointer::*;
22
use mmtk::util::ObjectReference;
3-
use mmtk::vm::EdgeVisitor;
43
use mmtk::vm::RootsWorkFactory;
54
use mmtk::vm::Scanning;
5+
use mmtk::vm::SlotVisitor;
66
use mmtk::Mutator;
7-
use V8Edge;
7+
use V8Slot;
88
use V8;
99

1010
pub struct VMScanning {}
1111

1212
impl Scanning<V8> for VMScanning {
13-
fn scan_object<EV: EdgeVisitor<V8Edge>>(
13+
fn scan_object<EV: SlotVisitor<V8Slot>>(
1414
_tls: VMWorkerThread,
1515
_object: ObjectReference,
1616
_edge_visitor: &mut EV,
@@ -25,12 +25,12 @@ impl Scanning<V8> for VMScanning {
2525
fn scan_roots_in_mutator_thread(
2626
_tls: VMWorkerThread,
2727
_mutator: &'static mut Mutator<V8>,
28-
_factory: impl RootsWorkFactory<V8Edge>,
28+
_factory: impl RootsWorkFactory<V8Slot>,
2929
) {
3030
unimplemented!()
3131
}
3232

33-
fn scan_vm_specific_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<V8Edge>) {
33+
fn scan_vm_specific_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<V8Slot>) {
3434
unimplemented!()
3535
}
3636

0 commit comments

Comments
 (0)