korrat/beancount-importers - Change SJ6AFVZL5HEXG5ZUV5STIGGIGLU56WGAQCSZBFFHQOVHAILBOS2QC

remove const configuration in favor of runtime config

Created by korrat on September 29, 2022

SJ6AFVZL5HEXG5ZUV5STIGGIGLU56WGAQCSZBFFHQOVHAILBOS2QC

Dependencies

In channels

main

Change contents

Insertion in common/beancount-tree-writer/src/lib.rs at line 1 [3.83]
[3.83]
[3.84]
```
use beancount_pretty_printer::Config as PrettyPrinterConfig;
```
Insertion in common/beancount-tree-writer/src/lib.rs at line 26 [3.83]
[3.708]
[3.708]
```
    pub pretty_printer: PrettyPrinterConfig,
```

Replacement in common/beancount-tree-writer/src/lib.rs at line 97 [3.83]

B:BD[3.2575] → [3.2575:2667]

                PrettyPrinter::<_, 2, 2, 100>::buffered(file).print_directives(&directives)

[3.2575]

[3.2667]

                PrettyPrinter::buffered(self.config.pretty_printer, file)
                    .print_directives(&directives)

Insertion in common/beancount-pretty-printer/tests/snapshotting.rs at line 1 [4.59]
[4.59]
[4.60]
```
use beancount_pretty_printer::Config;
```

Replacement in common/beancount-pretty-printer/tests/snapshotting.rs at line 14 [4.59]

B:BD[4.429] → [4.429:507]

    let mut printer = PrettyPrinter::<_, 2, 2, 100>::unbuffered(&mut buffer);

[4.429]

[4.507]

    let mut printer = PrettyPrinter::unbuffered(Config::default(), &mut buffer);

Insertion in common/beancount-pretty-printer/tests/snapshots/snapshotting__pretty_printed_transaction.snap at line 3 [4.1775]
[4.1842]
[4.1842]
```
assertion_line: 48
```

Replacement in common/beancount-pretty-printer/tests/snapshots/snapshotting__pretty_printed_transaction.snap at line 7 [4.1775]

B:BD[4.1881] → [4.1881:2139]

  Assets:Checking                                                                                         -100.00   EUR         
  Assets:Wallet                                                                                            100.00   EUR

[4.1881]

  Assets:Checking                                                                                         -100.00   EUR
  Assets:Wallet                                                                                            100.00   EUR

Replacement in common/beancount-pretty-printer/src/lib.rs at line 13 [5.86]

B:BD[5.367] → [5.367:420]

// TODO consider reimplementation based on pretty.rs

[5.367]

[5.420]

#[derive(Clone, Copy, Debug)]
pub struct AmountConfig {
    pub decimal_separator_column: usize,
    pub commodity_column: usize,
}
impl Default for AmountConfig {
    fn default() -> Self {
        Self {
            decimal_separator_column: 110,
            commodity_column: 116,
        }
    }
}

Replacement in common/beancount-pretty-printer/src/lib.rs at line 28 [5.86]

B:BD[5.421] → [5.421:553]

pub struct PrettyPrinter<
    W,
    const FLAG_COLUMN: usize,
    const ACCOUNT_COLUMN: usize,
    const AMOUNT_COLUMN: usize,
> {

[5.421]

[6.27]

#[derive(Clone, Copy, Debug)]
pub struct Config {
    pub account_column: usize,
    pub amount: AmountConfig,
    pub flag_column: usize,
}
impl Default for Config {
    fn default() -> Self {
        Self {
            account_column: 2,
            amount: Default::default(),
            flag_column: 2,
        }
    }
}
pub struct PrettyPrinter<W> {
    config: Config,

Replacement in common/beancount-pretty-printer/src/lib.rs at line 53 [5.86]

B:BD[5.570] → [5.570:726]

impl<W, const FLAG_COLUMN: usize, const ACCOUNT_COLUMN: usize, const AMOUNT_COLUMN: usize>
    PrettyPrinter<W, FLAG_COLUMN, ACCOUNT_COLUMN, AMOUNT_COLUMN>

[5.570]

[5.726]

impl<W> PrettyPrinter<W>

Replacement in common/beancount-pretty-printer/src/lib.rs at line 57 [5.86]
B:BD[5.748] → [5.748:790]
```
    pub fn unbuffered(inner: W) -> Self {
```
[5.748]
[6.58]
```
    pub fn unbuffered(config: Config, inner: W) -> Self {
```
Replacement in common/beancount-pretty-printer/src/lib.rs at line 59 [5.86]
∅:D[6.106] → [5.790:813]
B:BD[5.790] → [5.790:813]
```
        Self { inner }
```
[6.106]
[5.813]
```
        Self { config, inner }
```

Replacement in common/beancount-pretty-printer/src/lib.rs at line 63 [5.86]

B:BD[5.822] → [5.822:989]

impl<W, const FLAG_COLUMN: usize, const ACCOUNT_COLUMN: usize, const AMOUNT_COLUMN: usize>
    PrettyPrinter<BufWriter<W>, FLAG_COLUMN, ACCOUNT_COLUMN, AMOUNT_COLUMN>

[5.822]

[5.989]

impl<W> PrettyPrinter<BufWriter<W>>

Replacement in common/beancount-pretty-printer/src/lib.rs at line 67 [5.86]

B:BD[5.1011] → [5.1011:1051]

B:BD[5.1051] → [4.2140:2188]

    pub fn buffered(inner: W) -> Self {
        Self::unbuffered(BufWriter::new(inner))

[5.1011]

[5.1117]

    pub fn buffered(config: Config, inner: W) -> Self {
        Self::unbuffered(config, BufWriter::new(inner))

Replacement in common/beancount-pretty-printer/src/lib.rs at line 72 [5.86]

B:BD[5.1126] → [5.1126:1282]

impl<W, const FLAG_COLUMN: usize, const ACCOUNT_COLUMN: usize, const AMOUNT_COLUMN: usize>
    PrettyPrinter<W, FLAG_COLUMN, ACCOUNT_COLUMN, AMOUNT_COLUMN>

[5.1126]

[5.1282]

impl<W> PrettyPrinter<W>

Replacement in common/beancount-pretty-printer/src/lib.rs at line 83 [5.86]

B:BD[5.1478] → [5.1478:1632]

        let account_width = AMOUNT_COLUMN - 19;
        write!(self.inner, "{date} balance {account:account_width$}")?;
        self.print_amount(amount)

[5.1478]

[5.1632]

        write!(self.inner, "{date} balance {account}")?;
        self.print_amount(self.config.amount, amount)

Replacement in common/beancount-pretty-printer/src/lib.rs at line 137 [5.86]

B:BD[5.3219] → [5.3219:3375]

impl<W, const FLAG_COLUMN: usize, const ACCOUNT_COLUMN: usize, const AMOUNT_COLUMN: usize>
    PrettyPrinter<W, FLAG_COLUMN, ACCOUNT_COLUMN, AMOUNT_COLUMN>

[5.3219]

[5.3375]

impl<W> PrettyPrinter<W>

Replacement in common/beancount-pretty-printer/src/lib.rs at line 141 [5.86]

B:BD[5.3397] → [5.3397:3461]

    fn print_amount(&mut self, amount: &Amount) -> Result<()> {

[5.3397]

[5.3461]

    fn print_amount(&mut self, config: AmountConfig, amount: &Amount) -> Result<()> {

Replacement in common/beancount-pretty-printer/src/lib.rs at line 144 [5.86]

B:BD[5.3513] → [5.3513:3613]

        self.print_decimal_aligned(amount, 15, 4)?;
        write!(self.inner, " {commodity:12}")?;

[5.3513]

[5.3613]

        self.print_decimal_aligned(config.decimal_separator_column, amount)?;
        self.inner.ensure_column(config.commodity_column)?;
        write!(self.inner, "{commodity}")?;

Insertion in common/beancount-pretty-printer/src/lib.rs at line 163 [5.86]
[5.3899]
[5.3899]
```
        decimal_separator_column: usize,
```
Deletion in common/beancount-pretty-printer/src/lib.rs at line 165 [5.86]
B:BD[5.3926] → [5.3926:3979]
```
        total_width: usize,
        decimals: usize,
```
Replacement in common/beancount-pretty-printer/src/lib.rs at line 166 [5.86]
B:BD[5.4001] → [2.0:50]
```
        self.inner.ensure_column(AMOUNT_COLUMN)?;
```
[5.4001]
[2.50]
```
        let decimals = decimal.scale() as usize;
```

Replacement in common/beancount-pretty-printer/src/lib.rs at line 168 [5.86]

∅:D[2.51] → [5.4001:4113]

B:BD[5.4001] → [5.4001:4113]

        // TODO handle this with icu or similar (e.g. for digit grouping)?
        let mut buffer = [b' '; 32];

[2.51]

[5.4113]

        let mut buffer = [b' '; 64];
        write!(buffer.as_mut_slice(), "{decimal}")?;

Replacement in common/beancount-pretty-printer/src/lib.rs at line 171 [5.86]

B:BD[5.4114] → [5.4114:4248]

        let width = total_width - (decimals - (decimal.scale() as usize));
        write!(&mut buffer[..width], "{decimal:width$}")?;

[5.4114]

[5.4248]

        let buffer = buffer.trim();

Replacement in common/beancount-pretty-printer/src/lib.rs at line 173 [5.86]

B:BD[5.4249] → [5.4249:4320]

        self.inner.write_all(&buffer[..total_width])?;
        Ok(())

[5.4249]

[5.4320]

        // We can ignore the part right of the decimal separator when aligning the amount on the decimal separator
        let integral_digits = buffer.graphemes().count() - (decimals + 1);
        self.inner
            .ensure_column(decimal_separator_column - integral_digits)?;
        self.inner.write_all(buffer)

Replacement in common/beancount-pretty-printer/src/lib.rs at line 193 [5.86]

B:BD[5.4805] → [5.4805:4845]

            self.print_amount(amount)?;

[5.4805]

[5.4845]

            self.print_amount(self.config.amount, amount)?;

Replacement in common/beancount-pretty-printer/src/lib.rs at line 228 [5.86]

B:BD[2.265] → [2.265:325]

        self.inner.write_fmt(format_args!("{:shift$}", ""))

[2.265]

[2.325]

        self.write_fmt(format_args!("{:shift$}", ""))