korrat/beancount-importers - Change YBARPI2BY5EJYD3HKDWLXHZIL7CS3V3KT5O5UJVB2ICICP7O6BLQC

Make account templates owned

Created by korrat on January 3, 2023

YBARPI2BY5EJYD3HKDWLXHZIL7CS3V3KT5O5UJVB2ICICP7O6BLQC

Dependencies

In channels

main

Change contents

Insertion in common/beancount-types/tests/account_template.rs at line 1 [3.6783]
[3.6783]
[3.6784]
```
use core::str::FromStr;
```
Replacement in common/beancount-types/tests/account_template.rs at line 7 [3.6783]
B:BD[3.6865] → [3.6865:6928]
```
#[derive(Clone, Copy, Debug)]
struct AnySelector<'t>(&'t str);
```
[3.6865]
[3.6928]
```
#[derive(Clone, Debug)]
struct AnySelector(String);
```

Replacement in common/beancount-types/tests/account_template.rs at line 10 [3.6783]

B:BD[3.6929] → [3.6929:7014]

impl<'t> TryFrom<&'t str> for AnySelector<'t> {
    type Error = NeverSelectorError;

[3.6929]

[3.7014]

impl FromStr for AnySelector {
    type Err = NeverSelectorError;

Replacement in common/beancount-types/tests/account_template.rs at line 13 [3.6783]

B:BD[3.7015] → [3.7015:7122]

    fn try_from(value: &'t str) -> Result<Self, Self::Error> {
        Ok(Self(value.try_into().unwrap()))

[3.7015]

[3.7122]

    fn from_str(value: &str) -> Result<Self, Self::Err> {
        Ok(Self(value.into()))

Replacement in common/beancount-types/tests/account_template.rs at line 24 [3.6783]

B:BD[3.7247] → [3.7247:7326]

impl<'t> TryFrom<&'t str> for NoSelector {
    type Error = SelectorError<'t>;

[3.7247]

[3.7326]

impl FromStr for NoSelector {
    type Err = SelectorError;

Replacement in common/beancount-types/tests/account_template.rs at line 27 [3.6783]

B:BD[3.7327] → [3.7327:7433]

    fn try_from(selector: &'t str) -> Result<Self, Self::Error> {
        Err(SelectorError { selector })

[3.7327]

[3.7433]

    fn from_str(selector: &str) -> Result<Self, Self::Err> {
        SelectorSnafu { selector }.fail()

Replacement in common/beancount-types/tests/account_template.rs at line 33 [3.6783]
B:BD[3.7478] → [3.7478:7528]
```
struct SelectorError<'t> {
    selector: &'t str,
```
[3.7478]
[3.7528]
```
struct SelectorError {
    selector: String,
```
Replacement in common/beancount-types/src/account.rs at line 335 [4.11466]
B:BD[4.16993] → [4.16993:17017]
```
#[derive(Clone, Debug)]
```
[4.16993]
[4.17017]
```
#[derive(Clone, Debug, Deserialize)]
```
Insertion in common/beancount-types/src/account.rs at line 337 [4.11466]
[4.17038]
[4.17038]
```
#[serde(try_from = "String")]
```

Insertion in common/beancount-types/src/account.rs at line 401 [4.11466]

[4.18620]

    }
}
impl From<&Account> for Account {
    #[inline]
    fn from(value: &Account) -> Self {
        value.clone()

Insertion in common/beancount-types/src/account/template.rs at line 3 [3.9781]
[3.9826]
[3.9826]
```
use core::str::FromStr;
```
Deletion in common/beancount-types/src/account/template.rs at line 13 [3.9781]
B:BD[3.9989] → [3.9989:10005]
```
use crate::Acc;
```
Replacement in common/beancount-types/src/account/template.rs at line 17 [3.9781]
B:BD[3.10078] → [3.10078:10100]
```
pub enum Error<'t, E>
```
[3.10078]
[3.10100]
```
pub enum Error<E>
```
Replacement in common/beancount-types/src/account/template.rs at line 30 [3.9781]
B:BD[3.10368] → [3.10368:10395]
```
        template: &'t str,
```
[3.10368]
[3.10395]
```
        template: String,
```
Replacement in common/beancount-types/src/account/template.rs at line 65 [3.9781]
B:BD[3.10999] → [5.374:404]
```
#[derive(Debug, Deserialize)]
```
[3.10999]
[5.404]
```
#[derive(Clone, Debug, Deserialize)]
```

Replacement in common/beancount-types/src/account/template.rs at line 67 [3.9781]

B:BD[5.413] → [5.413:528]

    bound = "'de: 't, Selector: TryFrom<&'t str>, Selector::Error: 'static + Diagnostic",
    try_from = "&'t str"

[5.413]

[5.528]

    bound = "Selector: FromStr, Selector::Err: 'static + Diagnostic",
    try_from = "String"

Replacement in common/beancount-types/src/account/template.rs at line 70 [3.9781]

∅:D[5.531] → [3.11016:11113]

B:BD[3.11016] → [3.11016:11113]

pub struct Template<'t, Selector> {
    base: &'t Acc,
    segments: Vec<Segment<'t, Selector>>,

[5.531]

[3.11113]

pub struct Template<Selector> {
    base: Account,
    segments: Vec<Segment<Selector>>,

Replacement in common/beancount-types/src/account/template.rs at line 75 [3.9781]
B:BD[3.11116] → [3.11116:11158]
```
impl<'t, Selector> Template<'t, Selector>
```
[3.11116]
[3.11158]
```
impl<Selector> Template<Selector>
```

Replacement in common/beancount-types/src/account/template.rs at line 77 [3.9781]

B:BD[3.11164] → [3.11164:11229]

    Selector: TryFrom<&'t str>,
    Selector::Error: Diagnostic,

[3.11164]

[3.11229]

    Selector: FromStr,
    Selector::Err: Diagnostic,

Replacement in common/beancount-types/src/account/template.rs at line 80 [3.9781]

B:BD[3.11231] → [3.11231:11313]

    pub fn parse(template: &'t str) -> Result<Self, Error<'t, Selector::Error>> {

[3.11231]

[3.11313]

    pub fn parse(template: &str) -> Result<Self, Error<Selector::Err>> {

Replacement in common/beancount-types/src/account/template.rs at line 111 [3.9781]
B:BD[3.12212] → [3.12212:12256]
```
impl<'t, Selector> Template<'t, Selector> {
```
[3.12212]
[3.12256]
```
impl<'t, Selector> Template<Selector> {
```
Deletion in common/beancount-types/src/account/template.rs at line 115 [3.9781]
B:BD[3.12392] → [3.12392:12414]
```
        Selector: 't,
```
Replacement in common/beancount-types/src/account/template.rs at line 117 [3.9781]
B:BD[3.12488] → [3.12488:12531]
```
            Segment::Literal(seg) => *seg,
```
[3.12488]
[3.12531]
```
            Segment::Literal(seg) => seg,
```
Replacement in common/beancount-types/src/account/template.rs at line 121 [3.9781]
B:BD[3.12612] → [3.12612:12675]
B:BD[3.12675] → [2.1538:1572]
∅:D[2.1572] → [3.12710:12721]
B:BD[3.12710] → [3.12710:12721]
```
        fields.fold(self.base.to_owned(), |account, segment| {
            account.join(segment)
        })
```
[3.12612]
[5.532]
```
        fields.fold(self.base.clone(), Account::join)
```
Replacement in common/beancount-types/src/account/template.rs at line 125 [3.9781]
B:BD[5.541] → [5.541:593]
```
impl<'t, Selector> Clone for Template<'t, Selector>
```
[5.541]
[5.593]
```
impl<Selector> TryFrom<&str> for Template<Selector>
```
Replacement in common/beancount-types/src/account/template.rs at line 127 [3.9781]
B:BD[5.599] → [5.599:620]
```
    Selector: Clone,
```
[5.599]
[5.620]
```
    Selector: FromStr,
    Selector::Err: 'static + Diagnostic,
```

Replacement in common/beancount-types/src/account/template.rs at line 130 [3.9781]

B:BD[5.622] → [5.622:751]

    fn clone(&self) -> Self {
        Self {
            base: self.base,
            segments: self.segments.clone(),
        }

[5.622]

[3.12721]

    type Error = Error<Selector::Err>;
    fn try_from(template: &str) -> Result<Self, Self::Error> {
        Self::parse(template)

Replacement in common/beancount-types/src/account/template.rs at line 137 [3.9781]
B:BD[3.12730] → [3.12730:12793]
```
impl<'t, Selector> TryFrom<&'t str> for Template<'t, Selector>
```
[3.12730]
[3.12793]
```
impl<Selector> TryFrom<String> for Template<Selector>
```

Replacement in common/beancount-types/src/account/template.rs at line 139 [3.9781]

B:BD[3.12799] → [3.12799:12874]

    Selector: TryFrom<&'t str>,
    Selector::Error: 'static + Diagnostic,

[3.12799]

[3.12874]

    Selector: FromStr,
    Selector::Err: 'static + Diagnostic,

Replacement in common/beancount-types/src/account/template.rs at line 142 [3.9781]
B:BD[3.12876] → [3.12876:12921]
```
    type Error = Error<'t, Selector::Error>;
```
[3.12876]
[3.12921]
```
    type Error = Error<Selector::Err>;
```

Replacement in common/beancount-types/src/account/template.rs at line 144 [3.9781]

B:BD[3.12922] → [3.12922:13018]

    fn try_from(template: &'t str) -> Result<Self, Self::Error> {
        Self::parse(template)

[3.12922]

[3.13018]

    fn try_from(template: String) -> Result<Self, Self::Error> {
        Self::parse(&template)

Replacement in common/beancount-types/src/account/template.rs at line 150 [3.9781]
B:BD[3.13051] → [3.13051:13113]
```
pub(crate) enum Segment<'t, Selector> {
    Literal(&'t Seg),
```
[3.13051]
[3.13113]
```
pub(crate) enum Segment<Selector> {
    Literal(crate::Segment),
```
Replacement in common/beancount-types/src/account/template.rs at line 155 [3.9781]
B:BD[3.13140] → [3.13140:13181]
```
impl<'t, Selector> Segment<'t, Selector>
```
[3.13140]
[3.13181]
```
impl<Selector> Segment<Selector>
```

Replacement in common/beancount-types/src/account/template.rs at line 157 [3.9781]

B:BD[3.13187] → [3.13187:13262]

    Selector: TryFrom<&'t str>,
    Selector::Error: 'static + Diagnostic,

[3.13187]

[3.13262]

    Selector: FromStr,
    Selector::Err: Diagnostic,

Replacement in common/beancount-types/src/account/template.rs at line 160 [3.9781]

B:BD[3.13264] → [3.13264:13362]

    fn parse(segment: &'t str, span: SourceSpan) -> Result<Self, ParsingError<Selector::Error>> {

[3.13264]

[3.13362]

    fn parse(segment: &str, span: SourceSpan) -> Result<Self, ParsingError<Selector::Err>> {

Replacement in common/beancount-types/src/account/template.rs at line 165 [3.9781]
B:BD[3.13531] → [3.13531:13563]
```
                    .try_into()
```
[3.13531]
[3.13563]
```
                    .parse()
```
Replacement in common/beancount-types/src/account/template.rs at line 169 [3.9781]
B:BD[3.13657] → [3.13657:13695]
```
            <&Seg>::try_from(segment)
```
[3.13657]
[3.13695]
```
            crate::Segment::try_from(segment)
```

Replacement in common/beancount-types/src/account/template.rs at line 176 [3.9781]

B:BD[3.13802] → [3.13802:13899]

impl<'t, Selector> From<&'t Seg> for Segment<'t, Selector> {
    fn from(seg: &'t Seg) -> Self {

[3.13802]

[3.13899]

impl<Selector> From<crate::Segment> for Segment<Selector> {
    fn from(seg: crate::Segment) -> Self {

Replacement in common/beancount-types/src/account/template.rs at line 182 [3.9781]
B:BD[3.13935] → [3.13935:14000]
```
fn parse_trailing_segments<'t, Selector>(
    segments: &'t str,
```
[3.13935]
[3.14000]
```
fn parse_trailing_segments<Selector>(
    segments: &str,
```

Replacement in common/beancount-types/src/account/template.rs at line 185 [3.9781]

B:BD[3.14027] → [3.14027:14099]

) -> Result<Vec<Segment<Selector>>, Vec<ParsingError<Selector::Error>>>

[3.14027]

[3.14099]

) -> Result<Vec<Segment<Selector>>, Vec<ParsingError<Selector::Err>>>

Replacement in common/beancount-types/src/account/template.rs at line 187 [3.9781]
B:BD[3.14105] → [3.14105:14170]
```
    Selector: TryFrom<&'t str>,
    Selector::Error: Diagnostic,
```
[3.14105]
[3.14170]
```
    Selector: FromStr,
    Selector::Err: Diagnostic,
```

Make account templates owned

Dependencies

In channels

Change contents

Insertion in common/beancount-types/tests/account_template.rs at line 1 [3.6783]

Replacement in common/beancount-types/tests/account_template.rs at line 7 [3.6783]

Replacement in common/beancount-types/tests/account_template.rs at line 10 [3.6783]

Replacement in common/beancount-types/tests/account_template.rs at line 13 [3.6783]

Replacement in common/beancount-types/tests/account_template.rs at line 24 [3.6783]

Replacement in common/beancount-types/tests/account_template.rs at line 27 [3.6783]

Replacement in common/beancount-types/tests/account_template.rs at line 33 [3.6783]

Replacement in common/beancount-types/src/account.rs at line 335 [4.11466]

Insertion in common/beancount-types/src/account.rs at line 337 [4.11466]

Insertion in common/beancount-types/src/account.rs at line 401 [4.11466]

Insertion in common/beancount-types/src/account/template.rs at line 3 [3.9781]

Deletion in common/beancount-types/src/account/template.rs at line 13 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 17 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 30 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 65 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 67 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 70 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 75 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 77 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 80 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 111 [3.9781]

Deletion in common/beancount-types/src/account/template.rs at line 115 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 117 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 121 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 125 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 127 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 130 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 137 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 139 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 142 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 144 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 150 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 155 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 157 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 160 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 165 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 169 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 176 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 182 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 185 [3.9781]

Replacement in common/beancount-types/src/account/template.rs at line 187 [3.9781]