rust-vercel-next-refactoring-multi-merge-with-update

This mapping has 62 all-to-all groups: every node on one side corresponds to every node on the other, and none is deleted or inserted. Each member carries an all N:M badge; selecting one highlights all of its counterparts, in the tree and in the code view alike.

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before1use crate::database::key_value_database::KeySpace;
2
3pub struct ByKeySpace<T> {
  infra: T,
  task_meta: T,
  task_data: T,
  forward_task_cache: T,
  reverse_task_cache: T,
9}
10
11impl<T> ByKeySpace<T> {
  pub fn new(mut factory: impl FnMut(KeySpace) -> T) -> Self {
      Self {
          infra: factory(KeySpace::Infra),
          task_meta: factory(KeySpace::TaskMeta),
          task_data: factory(KeySpace::TaskData),
          forward_task_cache: factory(KeySpace::ForwardTaskCache),
          reverse_task_cache: factory(KeySpace::ReverseTaskCache),
      }
  }
21
  pub fn get(&self, key_space: KeySpace) -> &T {
      match key_space {
          KeySpace::Infra => &self.infra,
          KeySpace::TaskMeta => &self.task_meta,
          KeySpace::TaskData => &self.task_data,
          KeySpace::ForwardTaskCache => &self.forward_task_cache,
          KeySpace::ReverseTaskCache => &self.reverse_task_cache,
      }
  }
31
  pub fn get_mut(&mut self, key_space: KeySpace) -> &mut T {
      match key_space {
          KeySpace::Infra => &mut self.infra,
          KeySpace::TaskMeta => &mut self.task_meta,
          KeySpace::TaskData => &mut self.task_data,
          KeySpace::ForwardTaskCache => &mut self.forward_task_cache,
          KeySpace::ReverseTaskCache => &mut self.reverse_task_cache,
      }
  }
41
  pub fn iter(&self) -> impl Iterator<Item = (KeySpace, &T)> {
      [
          (KeySpace::Infra, &self.infra),
          (KeySpace::TaskMeta, &self.task_meta),
          (KeySpace::TaskData, &self.task_data),
          (KeySpace::ForwardTaskCache, &self.forward_task_cache),
          (KeySpace::ReverseTaskCache, &self.reverse_task_cache),
      ]
      .into_iter()
  }
52}
53

After1use crate::database::key_value_database::KeySpace;
2
3pub struct ByKeySpace<T> {
  infra: T,
  task_meta: T,
  task_data: T,
  task_cache: T,
8}
9
10impl<T> ByKeySpace<T> {
  pub fn new(mut factory: impl FnMut(KeySpace) -> T) -> Self {
      Self {
          infra: factory(KeySpace::Infra),
          task_meta: factory(KeySpace::TaskMeta),
          task_data: factory(KeySpace::TaskData),
          task_cache: factory(KeySpace::TaskCache),
      }
  }
19
  pub fn get(&self, key_space: KeySpace) -> &T {
      match key_space {
          KeySpace::Infra => &self.infra,
          KeySpace::TaskMeta => &self.task_meta,
          KeySpace::TaskData => &self.task_data,
          KeySpace::TaskCache => &self.task_cache,
      }
  }
28
  pub fn get_mut(&mut self, key_space: KeySpace) -> &mut T {
      match key_space {
          KeySpace::Infra => &mut self.infra,
          KeySpace::TaskMeta => &mut self.task_meta,
          KeySpace::TaskData => &mut self.task_data,
          KeySpace::TaskCache => &mut self.task_cache,
      }
  }
37
  pub fn iter(&self) -> impl Iterator<Item = (KeySpace, &T)> {
      [
          (KeySpace::Infra, &self.infra),
          (KeySpace::TaskMeta, &self.task_meta),
          (KeySpace::TaskData, &self.task_data),
          (KeySpace::TaskCache, &self.task_cache),
      ]
      .into_iter()
  }
47}
48

Before1use crate::database::key_value_database::KeySpace;
2
3pub struct ByKeySpace<T> {
  infra: T,
  task_meta: T,
  task_data: T,
  forward_task_cache: T,
  reverse_task_cache: T,
9}
10
11impl<T> ByKeySpace<T> {
  pub fn new(mut factory: impl FnMut(KeySpace) -> T) -> Self {
      Self {
          infra: factory(KeySpace::Infra),
          task_meta: factory(KeySpace::TaskMeta),
          task_data: factory(KeySpace::TaskData),
          forward_task_cache: factory(KeySpace::ForwardTaskCache),
          reverse_task_cache: factory(KeySpace::ReverseTaskCache),
      }
  }
21
  pub fn get(&self, key_space: KeySpace) -> &T {
      match key_space {
          KeySpace::Infra => &self.infra,
          KeySpace::TaskMeta => &self.task_meta,
          KeySpace::TaskData => &self.task_data,
          KeySpace::ForwardTaskCache => &self.forward_task_cache,
          KeySpace::ReverseTaskCache => &self.reverse_task_cache,
      }
  }
31
  pub fn get_mut(&mut self, key_space: KeySpace) -> &mut T {
      match key_space {
          KeySpace::Infra => &mut self.infra,
          KeySpace::TaskMeta => &mut self.task_meta,
          KeySpace::TaskData => &mut self.task_data,
          KeySpace::ForwardTaskCache => &mut self.forward_task_cache,
          KeySpace::ReverseTaskCache => &mut self.reverse_task_cache,
      }
  }
41
  pub fn iter(&self) -> impl Iterator<Item = (KeySpace, &T)> {
      [
          (KeySpace::Infra, &self.infra),
          (KeySpace::TaskMeta, &self.task_meta),
          (KeySpace::TaskData, &self.task_data),
          (KeySpace::ForwardTaskCache, &self.forward_task_cache),
          (KeySpace::ReverseTaskCache, &self.reverse_task_cache),
      ]
      .into_iter()
  }
52}
53

After1use crate::database::key_value_database::KeySpace;
2
3pub struct ByKeySpace<T> {
  infra: T,
  task_meta: T,
  task_data: T,
  task_cache: T,
8}
9
10impl<T> ByKeySpace<T> {
  pub fn new(mut factory: impl FnMut(KeySpace) -> T) -> Self {
      Self {
          infra: factory(KeySpace::Infra),
          task_meta: factory(KeySpace::TaskMeta),
          task_data: factory(KeySpace::TaskData),
          task_cache: factory(KeySpace::TaskCache),
      }
  }
19
  pub fn get(&self, key_space: KeySpace) -> &T {
      match key_space {
          KeySpace::Infra => &self.infra,
          KeySpace::TaskMeta => &self.task_meta,
          KeySpace::TaskData => &self.task_data,
          KeySpace::TaskCache => &self.task_cache,
      }
  }
28
  pub fn get_mut(&mut self, key_space: KeySpace) -> &mut T {
      match key_space {
          KeySpace::Infra => &mut self.infra,
          KeySpace::TaskMeta => &mut self.task_meta,
          KeySpace::TaskData => &mut self.task_data,
          KeySpace::TaskCache => &mut self.task_cache,
      }
  }
37
  pub fn iter(&self) -> impl Iterator<Item = (KeySpace, &T)> {
      [
          (KeySpace::Infra, &self.infra),
          (KeySpace::TaskMeta, &self.task_meta),
          (KeySpace::TaskData, &self.task_data),
          (KeySpace::TaskCache, &self.task_cache),
      ]
      .into_iter()
  }
47}
48

Before

source_file

use_declaration

use "use"

scoped_identifier

crate "crate"

:: "::"

identifier "database"

:: "::"

identifier "key_value_database"

:: "::"

identifier "KeySpace"

; ";"

struct_item

visibility_modifier

pub "pub"

struct "struct"

type_identifier "ByKeySpace"

type_parameters

< "<"

type_parameter

type_identifier "T"

> ">"

field_declaration_list

{ "{"

field_declaration

field_identifier "infra"

: ":"

type_identifier "T"

, ","

field_declaration

field_identifier "task_meta"

: ":"

type_identifier "T"

, ","

field_declaration

field_identifier "task_data"

: ":"

type_identifier "T"

, ","

field_declaration all 2:1

field_identifier "forward_task_cache" all 2:1

: ":" all 2:1

type_identifier "T" all 2:1

, "," all 2:1

field_declaration all 2:1

field_identifier "reverse_task_cache" all 2:1

: ":" all 2:1

type_identifier "T" all 2:1

, "," all 2:1

} "}"

impl_item

impl "impl"

type_parameters

< "<"

type_parameter

type_identifier "T"

> ">"

generic_type

type_identifier "ByKeySpace"

type_arguments

< "<"

type_identifier "T"

> ">"

declaration_list

{ "{"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "new"

parameters

( "("

parameter

mutable_specifier "mut"

identifier "factory"

: ":"

abstract_type

impl "impl"

function_type

type_identifier "FnMut"

parameters

( "("

type_identifier "KeySpace"

) ")"

-> "->"

type_identifier "T"

) ")"

-> "->"

type_identifier "Self"

block

{ "{"

struct_expression

type_identifier "Self"

field_initializer_list

{ "{"

field_initializer

field_identifier "infra"

: ":"

call_expression

identifier "factory"

arguments

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

) ")"

, ","

field_initializer

field_identifier "task_meta"

: ":"

call_expression

identifier "factory"

arguments

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

) ")"

, ","

field_initializer

field_identifier "task_data"

: ":"

call_expression

identifier "factory"

arguments

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

) ")"

, ","

field_initializer all 2:1

field_identifier "forward_task_cache" all 2:1

: ":" all 2:1

call_expression all 2:1

identifier "factory" all 2:1

arguments all 2:1

( "(" all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ForwardTaskCache" all 2:1

) ")" all 2:1

, "," all 2:1

field_initializer all 2:1

field_identifier "reverse_task_cache" all 2:1

: ":" all 2:1

call_expression all 2:1

identifier "factory" all 2:1

arguments all 2:1

( "(" all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ReverseTaskCache" all 2:1

) ")" all 2:1

, "," all 2:1

} "}"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "get"

parameters

( "("

self_parameter

& "&"

self "self"

, ","

parameter

identifier "key_space"

: ":"

type_identifier "KeySpace"

) ")"

-> "->"

reference_type

& "&"

type_identifier "T"

block

{ "{"

expression_statement

match_expression

match "match"

identifier "key_space"

match_block

{ "{"

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

=> "=>"

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "infra"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

=> "=>"

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_meta"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

=> "=>"

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_data"

, ","

match_arm all 2:1

match_pattern all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ForwardTaskCache" all 2:1

=> "=>" all 2:1

reference_expression all 2:1

& "&" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "forward_task_cache" all 2:1

, "," all 2:1

match_arm all 2:1

match_pattern all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ReverseTaskCache" all 2:1

=> "=>" all 2:1

reference_expression all 2:1

& "&" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "reverse_task_cache" all 2:1

, "," all 2:1

} "}"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "get_mut"

parameters

( "("

self_parameter

& "&"

mutable_specifier "mut"

self "self"

, ","

parameter

identifier "key_space"

: ":"

type_identifier "KeySpace"

) ")"

-> "->"

reference_type

& "&"

mutable_specifier "mut"

type_identifier "T"

block

{ "{"

expression_statement

match_expression

match "match"

identifier "key_space"

match_block

{ "{"

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

=> "=>"

reference_expression

& "&"

mutable_specifier "mut"

field_expression

self "self"

. "."

field_identifier "infra"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

=> "=>"

reference_expression

& "&"

mutable_specifier "mut"

field_expression

self "self"

. "."

field_identifier "task_meta"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

=> "=>"

reference_expression

& "&"

mutable_specifier "mut"

field_expression

self "self"

. "."

field_identifier "task_data"

, ","

match_arm all 2:1

match_pattern all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ForwardTaskCache" all 2:1

=> "=>" all 2:1

reference_expression all 2:1

& "&" all 2:1

mutable_specifier "mut" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "forward_task_cache" all 2:1

, "," all 2:1

match_arm all 2:1

match_pattern all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ReverseTaskCache" all 2:1

=> "=>" all 2:1

reference_expression all 2:1

& "&" all 2:1

mutable_specifier "mut" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "reverse_task_cache" all 2:1

, "," all 2:1

} "}"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "iter"

parameters

( "("

self_parameter

& "&"

self "self"

) ")"

-> "->"

abstract_type

impl "impl"

generic_type

type_identifier "Iterator"

type_arguments

< "<"

type_binding

type_identifier "Item"

= "="

tuple_type

( "("

type_identifier "KeySpace"

, ","

reference_type

& "&"

type_identifier "T"

) ")"

> ">"

block

{ "{"

call_expression

field_expression

array_expression

[ "["

tuple_expression

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

, ","

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "infra"

) ")"

, ","

tuple_expression

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

, ","

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_meta"

) ")"

, ","

tuple_expression

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

, ","

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_data"

) ")"

, ","

tuple_expression all 2:1

( "(" all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ForwardTaskCache" all 2:1

, "," all 2:1

reference_expression all 2:1

& "&" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "forward_task_cache" all 2:1

) ")" all 2:1

, "," all 2:1

tuple_expression all 2:1

( "(" all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "ReverseTaskCache" all 2:1

, "," all 2:1

reference_expression all 2:1

& "&" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "reverse_task_cache" all 2:1

) ")" all 2:1

, "," all 2:1

] "]"

. "."

field_identifier "into_iter"

arguments

( "("

) ")"

} "}"

After

source_file

use_declaration

use "use"

scoped_identifier

crate "crate"

:: "::"

identifier "database"

:: "::"

identifier "key_value_database"

:: "::"

identifier "KeySpace"

; ";"

struct_item

visibility_modifier

pub "pub"

struct "struct"

type_identifier "ByKeySpace"

type_parameters

< "<"

type_parameter

type_identifier "T"

> ">"

field_declaration_list

{ "{"

field_declaration

field_identifier "infra"

: ":"

type_identifier "T"

, ","

field_declaration

field_identifier "task_meta"

: ":"

type_identifier "T"

, ","

field_declaration

field_identifier "task_data"

: ":"

type_identifier "T"

, ","

field_declaration all 2:1

field_identifier "task_cache" all 2:1

: ":" all 2:1

type_identifier "T" all 2:1

, "," all 2:1

} "}"

impl_item

impl "impl"

type_parameters

< "<"

type_parameter

type_identifier "T"

> ">"

generic_type

type_identifier "ByKeySpace"

type_arguments

< "<"

type_identifier "T"

> ">"

declaration_list

{ "{"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "new"

parameters

( "("

parameter

mutable_specifier "mut"

identifier "factory"

: ":"

abstract_type

impl "impl"

function_type

type_identifier "FnMut"

parameters

( "("

type_identifier "KeySpace"

) ")"

-> "->"

type_identifier "T"

) ")"

-> "->"

type_identifier "Self"

block

{ "{"

struct_expression

type_identifier "Self"

field_initializer_list

{ "{"

field_initializer

field_identifier "infra"

: ":"

call_expression

identifier "factory"

arguments

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

) ")"

, ","

field_initializer

field_identifier "task_meta"

: ":"

call_expression

identifier "factory"

arguments

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

) ")"

, ","

field_initializer

field_identifier "task_data"

: ":"

call_expression

identifier "factory"

arguments

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

) ")"

, ","

field_initializer all 2:1

field_identifier "task_cache" all 2:1

: ":" all 2:1

call_expression all 2:1

identifier "factory" all 2:1

arguments all 2:1

( "(" all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "TaskCache" all 2:1

) ")" all 2:1

, "," all 2:1

} "}"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "get"

parameters

( "("

self_parameter

& "&"

self "self"

, ","

parameter

identifier "key_space"

: ":"

type_identifier "KeySpace"

) ")"

-> "->"

reference_type

& "&"

type_identifier "T"

block

{ "{"

expression_statement

match_expression

match "match"

identifier "key_space"

match_block

{ "{"

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

=> "=>"

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "infra"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

=> "=>"

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_meta"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

=> "=>"

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_data"

, ","

match_arm all 2:1

match_pattern all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "TaskCache" all 2:1

=> "=>" all 2:1

reference_expression all 2:1

& "&" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "task_cache" all 2:1

, "," all 2:1

} "}"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "get_mut"

parameters

( "("

self_parameter

& "&"

mutable_specifier "mut"

self "self"

, ","

parameter

identifier "key_space"

: ":"

type_identifier "KeySpace"

) ")"

-> "->"

reference_type

& "&"

mutable_specifier "mut"

type_identifier "T"

block

{ "{"

expression_statement

match_expression

match "match"

identifier "key_space"

match_block

{ "{"

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

=> "=>"

reference_expression

& "&"

mutable_specifier "mut"

field_expression

self "self"

. "."

field_identifier "infra"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

=> "=>"

reference_expression

& "&"

mutable_specifier "mut"

field_expression

self "self"

. "."

field_identifier "task_meta"

, ","

match_arm

match_pattern

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

=> "=>"

reference_expression

& "&"

mutable_specifier "mut"

field_expression

self "self"

. "."

field_identifier "task_data"

, ","

match_arm all 2:1

match_pattern all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "TaskCache" all 2:1

=> "=>" all 2:1

reference_expression all 2:1

& "&" all 2:1

mutable_specifier "mut" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "task_cache" all 2:1

, "," all 2:1

} "}"

function_item

visibility_modifier

pub "pub"

fn "fn"

identifier "iter"

parameters

( "("

self_parameter

& "&"

self "self"

) ")"

-> "->"

abstract_type

impl "impl"

generic_type

type_identifier "Iterator"

type_arguments

< "<"

type_binding

type_identifier "Item"

= "="

tuple_type

( "("

type_identifier "KeySpace"

, ","

reference_type

& "&"

type_identifier "T"

) ")"

> ">"

block

{ "{"

call_expression

field_expression

array_expression

[ "["

tuple_expression

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "Infra"

, ","

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "infra"

) ")"

, ","

tuple_expression

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskMeta"

, ","

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_meta"

) ")"

, ","

tuple_expression

( "("

scoped_identifier

identifier "KeySpace"

:: "::"

identifier "TaskData"

, ","

reference_expression

& "&"

field_expression

self "self"

. "."

field_identifier "task_data"

) ")"

, ","

tuple_expression all 2:1

( "(" all 2:1

scoped_identifier all 2:1

identifier "KeySpace" all 2:1

:: "::" all 2:1

identifier "TaskCache" all 2:1

, "," all 2:1

reference_expression all 2:1

& "&" all 2:1

field_expression all 2:1

self "self" all 2:1

. "." all 2:1

field_identifier "task_cache" all 2:1

) ")" all 2:1

, "," all 2:1

] "]"

. "."

field_identifier "into_iter"

arguments

( "("

) ")"

} "}"