O01eg/freeorion-test-web - Change WVHXYKCVPKAFVMXBEMD3IHG54RKOIDSOCVNR3OIPEZQG36IGYJZQC

Add postgresql pools

Created by O01eg on January 27, 2022

WVHXYKCVPKAFVMXBEMD3IHG54RKOIDSOCVNR3OIPEZQG36IGYJZQC

Dependencies

In channels

main

Change contents

Replacement in src/pages/reset_game_pwd.rs at line 4 [4.597]
B:BD[4.664] → [4.664:692]
```
use handlebars::Handlebars;
```
[4.664]
[4.692]
```
use crate::WebData;
```

Replacement in src/pages/reset_game_pwd.rs at line 6 [4.597]

B:BD[4.693] → [4.693:774]

B:BD[4.774] → [3.0:56]

pub async fn get_reset_game_pwd(hb: web::Data<Handlebars<'_>>) -> HttpResponse {
    let body = match hb.render("reset-game-pwd", &()) {

[4.693]

[3.56]

#[actix_web::get("/reset-game-pwd-{token}.html")]
pub async fn get_reset_game_pwd(
    _token: web::Path<String>,
    data: web::Data<WebData<'_>>,
) -> HttpResponse {
    let body = match data.handlebars.render("reset-game-pwd", &()) {

Replacement in src/pages/reset_game_pwd.rs at line 21 [4.597]

B:BD[4.910] → [4.910:963]

pub async fn post_reset_game_pwd() -> HttpResponse {

[4.910]

[4.963]

#[actix_web::post("/reset-game-pwd.do")]
pub async fn post_reset_game_pwd(_data: web::Data<WebData<'_>>) -> HttpResponse {

Insertion in src/pages/mod.rs at line 1 [5.50]
[5.50]
[5.51]
```
use handlebars::Handlebars;
```

Insertion in src/pages/mod.rs at line 5 [5.50]

[4.1091]


pub struct WebData<'a> {
    pub handlebars: Handlebars<'a>,
    pub pool_ro: deadpool_postgres::Pool,
    pub pool_rw: deadpool_postgres::Pool,
}

Replacement in src/pages/index.rs at line 3 [5.100]
B:BD[5.138] → [5.138:166]
```
use handlebars::Handlebars;
```
[5.138]
[5.166]
```
use crate::WebData;
```

Replacement in src/pages/index.rs at line 5 [5.100]

B:BD[5.167] → [5.167:235]

B:BD[5.235] → [3.267:314]

pub async fn index(hb: web::Data<Handlebars<'_>>) -> HttpResponse {
    let body = match hb.render("index", &()) {

[5.167]

[3.314]

pub async fn index(data: web::Data<WebData<'_>>) -> HttpResponse {
    let body = match data.handlebars.render("index", &()) {

Replacement in src/main.rs at line 9 [7.17]
B:BD[6.83] → [6.83:110]
```
use crate::config::Config;
```
[6.83]
[8.122]
```
use config::{read_dsn, Config};
```
Insertion in src/main.rs at line 15 [7.17]
[4.1187]
[9.94]
```
use pages::WebData;
```

Replacement in src/main.rs at line 37 [7.17]

B:BD[6.737] → [10.33:69]

∅:D[10.69] → [6.737:779]

B:BD[6.737] → [6.737:779]

    #[cfg(feature = "actix-files")]
    let Config { http, public } = config;

[6.737]

[10.70]

    let Config {
        http,
        dsn_ro_path,
        dsn_rw_path,
        dsn_conn,
        #[cfg(feature = "actix-files")]
        public,
    } = config;

Replacement in src/main.rs at line 46 [7.17]

B:BD[10.71] → [10.71:146]

    #[cfg(not(feature = "actix-files"))]
    let Config { http } = config;

[10.71]

[6.779]

    let pg_ro_config = read_dsn(dsn_ro_path)?;
    let pg_rw_config = read_dsn(dsn_rw_path)?;
    let mgr_ro = deadpool_postgres::Manager::from_config(
        pg_ro_config,
        tokio_postgres::NoTls,
        deadpool_postgres::ManagerConfig {
            recycling_method: deadpool_postgres::RecyclingMethod::Fast,
        },
    );
    let mgr_rw = deadpool_postgres::Manager::from_config(
        pg_rw_config,
        tokio_postgres::NoTls,
        deadpool_postgres::ManagerConfig {
            recycling_method: deadpool_postgres::RecyclingMethod::Fast,
        },
    );
    let pool_ro = deadpool_postgres::Pool::builder(mgr_ro)
        .max_size(dsn_conn)
        .build()
        .expect("Postgresql RO pool");

Insertion in src/main.rs at line 68 [7.17]

[6.780]

[8.287]

    let pool_rw = deadpool_postgres::Pool::builder(mgr_rw)
        .max_size(dsn_conn)
        .build()
        .expect("Postgresql RW pool");

Replacement in src/main.rs at line 84 [7.17]

B:BD[8.500] → [8.500:553]

    let handlebars_ref = web::Data::new(handlebars);

[8.500]

[8.553]

    let data_ref = web::Data::new(WebData {
        handlebars,
        pool_ro,
        pool_rw,
    });

Replacement in src/main.rs at line 101 [7.17]
∅:D[2.284] → [8.555:601]
B:BD[6.912] → [8.555:601]
```
            .app_data(handlebars_ref.clone())
```
[2.284]
[8.601]
```
            .app_data(data_ref.clone())
```

Replacement in src/main.rs at line 104 [7.17]

B:BD[4.1429] → [4.1429:1641]

            .route(
                "/reset-game-pwd-{token}.html",
                web::get().to(get_reset_game_pwd),
            )
            .route("/reset-game-pwd.do", web::post().to(post_reset_game_pwd));

[4.1429]

[10.261]

            .service(get_reset_game_pwd)
            .service(post_reset_game_pwd);

Insertion in src/config.rs at line 10 [6.1410]

[6.1583]

[10.731]

    pub dsn_ro_path: std::path::PathBuf,
    pub dsn_rw_path: std::path::PathBuf,
    pub dsn_conn: usize,

Deletion in src/config.rs at line 19 [6.1410]
B:BD[6.1699] → [6.1699:1727]
```
        use std::io::Read;
```
Insertion in src/config.rs at line 21 [6.1410]
[6.1806]
[6.1806]
```
        use std::io::Read;
```

Insertion in src/config.rs at line 27 [6.1410]

[6.1891]


pub fn read_dsn<P: AsRef<Path>>(path: P) -> io::Result<tokio_postgres::config::Config> {
    let mut f = File::open(path)?;
    let mut buffer = String::new();
    use std::io::Read;
    f.read_to_string(&mut buffer)?;
    use std::str::FromStr;
    tokio_postgres::config::Config::from_str(&buffer)
        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
}

Replacement in Cargo.toml at line 21 [7.77]

B:BD[11.1415] → [12.0:17]

openssl = "0.10"

[11.1415]

[6.8498]

deadpool-postgres = "0.10"
uuid = "0.8"
[dependencies.tokio-postgres]
version = "0.7.5"
features = ["with-uuid-0_8"]

Insertion in Cargo.lock at line 253 [6.8513]

[11.3345]

[6.14057]


[[package]]
name = "async-trait"
version = "0.1.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]

Replacement in Cargo.lock at line 389 [6.8513]
B:BD[6.17200] → [13.1346:1365]
```
version = "3.0.12"
```
[6.17200]
[6.17219]
```
version = "3.0.13"
```

Replacement in Cargo.lock at line 391 [6.8513]

B:BD[6.17284] → [13.1366:1444]

checksum = "2afefa54b5c7dd40918dc1e09f213a171ab5937aadccab45e804780b238f9f43"

[6.17284]

[6.17362]

checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e"

Insertion in Cargo.lock at line 447 [6.8513]

[11.4772]

[6.18351]

name = "deadpool"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bf0c5365c0925c80a838a6810a1bf38d3304ca6b4eb25829e29e33da12de786"
dependencies = [
 "async-trait",
 "deadpool-runtime",
 "num_cpus",
 "tokio",
]
[[package]]
name = "deadpool-postgres"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46ff1451a33b8b31b15eedcf5401dbbb28606caed4fa94d20487eb3fac2ebd04"
dependencies = [
 "deadpool",
 "log",
 "tokio",
 "tokio-postgres",
]
[[package]]
name = "deadpool-runtime"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1"
dependencies = [
 "tokio",
]
[[package]]

Insertion in Cargo.lock at line 510 [6.8513]
[11.5102]
[6.18813]
```
 "subtle",
```

Insertion in Cargo.lock at line 542 [6.8513]

[11.5313]

name = "fallible-iterator"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
[[package]]

Deletion in Cargo.lock at line 570 [6.8513]

B:BD[6.20137] → [12.18:259]


[[package]]
name = "foreign-types"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
 "foreign-types-shared",
]

Deletion in Cargo.lock at line 572 [6.8513]

B:BD[12.272] → [12.272:463]

∅:D[12.463] → [6.20137:20150]

B:BD[6.20137] → [6.20137:20150]

name = "foreign-types-shared"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]

Insertion in Cargo.lock at line 588 [6.8513]
[6.20503]
[6.20503]
```
 "deadpool-postgres",
```
Deletion in Cargo.lock at line 592 [6.8513]
∅:D[3.537] → [12.464:476]
B:BD[9.3011] → [12.464:476]
```
 "openssl",
```
Insertion in Cargo.lock at line 594 [6.8513]
[6.20545]
[6.20545]
```
 "tokio-postgres",
```

Insertion in Cargo.lock at line 596 [6.8513]

[6.20554]

 "uuid",
]
[[package]]
name = "futures"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
dependencies = [
 "futures-channel",
 "futures-core",
 "futures-executor",
 "futures-io",
 "futures-sink",
 "futures-task",
 "futures-util",

Insertion in Cargo.lock at line 615 [6.8513]

[6.20569]

[6.20805]

name = "futures-channel"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
dependencies = [
 "futures-core",
 "futures-sink",
]
[[package]]

Insertion in Cargo.lock at line 631 [6.8513]

[6.21002]

name = "futures-executor"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
dependencies = [
 "futures-core",
 "futures-task",
 "futures-util",
]
[[package]]
name = "futures-io"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
[[package]]
name = "futures-macro"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]
[[package]]

Insertion in Cargo.lock at line 676 [6.8513]
[6.21597]
[6.21597]
```
 "futures-channel",
```
Insertion in Cargo.lock at line 678 [6.8513]
[6.21614]
[6.21631]
```
 "futures-io",
 "futures-macro",
 "futures-sink",
```
Insertion in Cargo.lock at line 682 [6.8513]
[6.21648]
[6.21648]
```
 "memchr",
```
Insertion in Cargo.lock at line 685 [6.8513]
[6.21683]
[6.21683]
```
 "slab",
```
Replacement in Cargo.lock at line 720 [6.8513]
B:BD[6.22198] → [11.6383:6402]
```
version = "0.3.10"
```
[6.22198]
[6.22216]
```
version = "0.3.11"
```

Replacement in Cargo.lock at line 722 [6.8513]

B:BD[6.22281] → [11.6403:6481]

checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689"

[6.22281]

[6.22359]

checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e"

Insertion in Cargo.lock at line 767 [6.8513]

[6.22964]

name = "hmac"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddca131f3e7f2ce2df364b57949a9d47915cfbd35e46cfee355ccebbf794d6a2"
dependencies = [
 "digest 0.10.1",
]
[[package]]

Insertion in Cargo.lock at line 920 [6.8513]

[11.9052]

[6.25694]


[[package]]
name = "md-5"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae"
dependencies = [
 "digest 0.10.1",
]

Replacement in Cargo.lock at line 1018 [6.8513]
B:BD[13.1894] → [13.1894:1912]
```
version = "0.1.2"
```
[13.1894]
[13.1912]
```
version = "0.1.3"
```

Replacement in Cargo.lock at line 1020 [6.8513]

B:BD[13.1977] → [13.1977:2055]

checksum = "71a1eb3a36534514077c1e079ada2fb170ef30c47d203aa6916138cf882ecd52"

[13.1977]

[13.2055]

checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15"

Deletion in Cargo.lock at line 1036 [6.8513]

B:BD[9.3882] → [9.3882:3895]

B:BD[9.3895] → [12.477:757]


[[package]]
name = "openssl"
version = "0.10.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
dependencies = [
 "bitflags",
 "cfg-if",
 "foreign-types",
 "libc",
 "once_cell",
 "openssl-sys",
]

Deletion in Cargo.lock at line 1038 [6.8513]

B:BD[12.770] → [12.770:1038]

name = "openssl-sys"
version = "0.9.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
dependencies = [
 "autocfg",
 "cc",
 "libc",
 "pkg-config",
 "vcpkg",
]
[[package]]

Insertion in Cargo.lock at line 1127 [6.8513]

[6.29133]

name = "phf"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
dependencies = [
 "phf_shared",
]
[[package]]
name = "phf_shared"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
dependencies = [
 "siphasher",
]
[[package]]

Replacement in Cargo.lock at line 1157 [6.8513]
B:BD[6.29526] → [12.1039:1078]
```
name = "pkg-config"
version = "0.3.24"
```
[6.29526]
[12.1078]
```
name = "postgres-protocol"
version = "0.6.3"
```

Replacement in Cargo.lock at line 1160 [6.8513]

B:BD[12.1143] → [12.1143:1221]

checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"

[12.1143]

[12.1221]

checksum = "79ec03bce71f18b4a27c4c64c6ba2ddf74686d69b91d8714fb32ead3adaed713"
dependencies = [
 "base64",
 "byteorder",
 "bytes",
 "fallible-iterator",
 "hmac",
 "md-5",
 "memchr",
 "rand",
 "sha2",
 "stringprep",
]
[[package]]
name = "postgres-types"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04619f94ba0cc80999f4fc7073607cb825bc739a883cb6d20900fc5e009d6b0d"
dependencies = [
 "bytes",
 "fallible-iterator",
 "postgres-protocol",
 "uuid",
]

Replacement in Cargo.lock at line 1311 [6.8513]
B:BD[6.33070] → [13.2172:2192]
```
version = "1.0.135"
```
[6.33070]
[6.33090]
```
version = "1.0.136"
```

Replacement in Cargo.lock at line 1313 [6.8513]

B:BD[6.33155] → [13.2193:2271]

checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b"

[6.33155]

[6.33233]

checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"

Replacement in Cargo.lock at line 1320 [6.8513]
B:BD[6.33304] → [13.2272:2292]
```
version = "1.0.135"
```
[6.33304]
[6.33324]
```
version = "1.0.136"
```

Replacement in Cargo.lock at line 1322 [6.8513]

B:BD[6.33389] → [13.2293:2371]

checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d"

[6.33389]

[6.33467]

checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"

Insertion in Cargo.lock at line 1376 [6.8513]

[6.34507]

name = "sha2"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec"
dependencies = [
 "cfg-if",
 "cpufeatures",
 "digest 0.10.1",
]
[[package]]

Insertion in Cargo.lock at line 1394 [6.8513]

[6.34726]


[[package]]
name = "siphasher"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a86232ab60fa71287d7f2ddae4a7073f6b7aac33631c3015abb556f08c6d0a3e"

Insertion in Cargo.lock at line 1424 [6.8513]

[6.36520]

[6.36727]

name = "stringprep"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
dependencies = [
 "unicode-bidi",
 "unicode-normalization",
]
[[package]]

Insertion in Cargo.lock at line 1440 [6.8513]

[6.36917]

name = "subtle"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]

Replacement in Cargo.lock at line 1473 [6.8513]
B:BD[6.37867] → [13.2884:2902]
```
version = "0.3.6"
```
[6.37867]
[6.37886]
```
version = "0.3.7"
```

Replacement in Cargo.lock at line 1475 [6.8513]

B:BD[6.37951] → [13.2903:2981]

checksum = "c8d54b9298e05179c335de2b9645d061255bcd5155f843b3e328d2cfe0a5b413"

[6.37951]

[6.38029]

checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d"

Insertion in Cargo.lock at line 1519 [6.8513]

[6.39452]

]
[[package]]
name = "tokio-postgres"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b6c8b33df661b548dcd8f9bf87debb8c56c05657ed291122e1188698c2ece95"
dependencies = [
 "async-trait",
 "byteorder",
 "bytes",
 "fallible-iterator",
 "futures",
 "log",
 "parking_lot",
 "percent-encoding",
 "phf",
 "pin-project-lite",
 "postgres-protocol",
 "postgres-types",
 "socket2",
 "tokio",
 "tokio-util",

Replacement in Cargo.lock at line 1642 [6.8513]
B:BD[6.42453] → [12.1235:1269]
```
name = "vcpkg"
version = "0.2.15"
```
[6.42453]
[12.1269]
```
name = "uuid"
version = "0.8.2"
```

Replacement in Cargo.lock at line 1645 [6.8513]

B:BD[12.1334] → [12.1334:1412]

checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

[12.1334]

[12.1412]

checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"

Add postgresql pools

Dependencies

In channels

Change contents

Replacement in src/pages/reset_game_pwd.rs at line 4 [4.597]

Replacement in src/pages/reset_game_pwd.rs at line 6 [4.597]

Replacement in src/pages/reset_game_pwd.rs at line 21 [4.597]

Insertion in src/pages/mod.rs at line 1 [5.50]

Insertion in src/pages/mod.rs at line 5 [5.50]

Replacement in src/pages/index.rs at line 3 [5.100]

Replacement in src/pages/index.rs at line 5 [5.100]

Replacement in src/main.rs at line 9 [7.17]

Insertion in src/main.rs at line 15 [7.17]

Replacement in src/main.rs at line 37 [7.17]

Replacement in src/main.rs at line 46 [7.17]

Insertion in src/main.rs at line 68 [7.17]

Replacement in src/main.rs at line 84 [7.17]

Replacement in src/main.rs at line 101 [7.17]

Replacement in src/main.rs at line 104 [7.17]

Insertion in src/config.rs at line 10 [6.1410]

Deletion in src/config.rs at line 19 [6.1410]

Insertion in src/config.rs at line 21 [6.1410]

Insertion in src/config.rs at line 27 [6.1410]

Replacement in Cargo.toml at line 21 [7.77]

Insertion in Cargo.lock at line 253 [6.8513]

Replacement in Cargo.lock at line 389 [6.8513]

Replacement in Cargo.lock at line 391 [6.8513]

Insertion in Cargo.lock at line 447 [6.8513]

Insertion in Cargo.lock at line 510 [6.8513]

Insertion in Cargo.lock at line 542 [6.8513]

Deletion in Cargo.lock at line 570 [6.8513]

Deletion in Cargo.lock at line 572 [6.8513]

Insertion in Cargo.lock at line 588 [6.8513]

Deletion in Cargo.lock at line 592 [6.8513]

Insertion in Cargo.lock at line 594 [6.8513]

Insertion in Cargo.lock at line 596 [6.8513]

Insertion in Cargo.lock at line 615 [6.8513]

Insertion in Cargo.lock at line 631 [6.8513]

Insertion in Cargo.lock at line 676 [6.8513]

Insertion in Cargo.lock at line 678 [6.8513]

Insertion in Cargo.lock at line 682 [6.8513]

Insertion in Cargo.lock at line 685 [6.8513]

Replacement in Cargo.lock at line 720 [6.8513]