Jengamon/rexweb - Change DZPGVVKGX6QS4HX5GVF3DR3UZAV2EOMMVRUDEGTR2OPJVDG3FNXQC

trust the font process on desktop

Created by Jengamon on February 7, 2024

DZPGVVKGX6QS4HX5GVF3DR3UZAV2EOMMVRUDEGTR2OPJVDG3FNXQC

Dependencies

In channels

main

Change contents

Insertion in src/text.rs at line 14 [4.32]
[4.289]
[5.1251]
```
use sys_locale::get_locale;
```

Replacement in src/text.rs at line 29 [4.32]

B:BD[6.293] → [6.293:751]

        let required_fonts = [
            "fonts.poiret_one.PoiretOne-Regular",
            "fonts.noto_color_emoji.NotoColorEmoji-Regular",
        ];
        let fonts: Vec<_> = required_fonts
            .into_iter()
            .map(|id| {
                let font_data_handle = assets.load::<FontData>(id)?;
                let font_data: Arc<Vec<u8>> = Arc::new(font_data_handle.read().0.clone());
                Ok((id, Source::Binary(font_data)))

[6.293]

[6.751]

        let fonts_handle = assets.load_rec_dir::<FontData>("fonts")?;
        let fonts: Vec<_> = fonts_handle
            .read()
            .iter(assets)
            .filter_map(|maybe_font| match maybe_font {
                Ok(font_handle) => {
                    let font_data: Arc<Vec<u8>> = Arc::new(font_handle.read().0.clone());
                    let id = font_handle.id();
                    Some((id, Source::Binary(font_data)))
                }
                Err(e) => {
                    log::info!("failed to recursively load a font: {e}");
                    None
                }

Replacement in src/text.rs at line 44 [4.32]

B:BD[6.766] → [6.766:829]

            .collect::<Result<Vec<_>, color_eyre::Report>>()?;

[6.766]

[6.829]

            .collect();

Replacement in src/text.rs at line 47 [4.32]

B:BD[6.885] → [6.885:927]

        let locale = "en-US".to_string();

[6.885]

[6.927]

        let locale = get_locale().unwrap_or_else(|| "en-US".to_string());

Replacement in src/text.rs at line 53 [4.32]

B:BD[6.1082] → [6.1082:1130]

        for (id, source) in fonts.into_iter() {

[6.1082]

[6.1130]

        for (asset_id, source) in fonts.into_iter() {

Replacement in src/text.rs at line 55 [4.32]

B:BD[6.1181] → [3.0:50]

            log::warn!("loaded {id} into {ids}");

[6.1181]

[6.1231]

            log::warn!("loaded {asset_id} into {ids}");

Deletion in src/text.rs at line 57 [4.32]

B:BD[6.1241] → [6.1241:1373]

        // Set up default families
        // Default to emoji for sans serif
        db.set_sans_serif_family("Noto Color Emoji");

Insertion in src/lib.rs at line 39 [8.1268]

[7.8505]

// taken from https://github.com/rust-windowing/winit/issues/1199#issuecomment-1685122253

Replacement in src/lib.rs at line 66 [8.1268]

B:BD[7.9291] → [7.9291:9365]

    /// This immediately pools the task once, and then schedules it to be

[7.9291]

[7.9365]

    /// This immediately polls the task once, and then schedules it to be

Replacement in src/lib.rs at line 69 [8.1268]

B:BD[3.1140] → [3.1140:1281]

    pub fn spawn(
        &mut self,
        task: impl Future<Output = Result<(), E>> + 'static,
    ) -> (TaskId, Option<Result<(), E>>) {

[3.1140]

[7.9517]

    pub fn spawn(&mut self, task: impl Future<Output = Result<(), E>> + 'static) -> Result<(), E> {

Replacement in src/lib.rs at line 73 [8.1268]

B:BD[7.9637] → [3.1282:1320]

        (task_id, self.poll(task_id))

[7.9637]

[7.9665]

        if let Some(res) = self.poll(task_id) {
            res
        } else {
            self.event_loop_proxy.send_event(PollTask(task_id)).unwrap();
            Ok(())
        }

Deletion in src/lib.rs at line 157 [8.1268]
B:BD[7.10809] → [3.1321:1367]
```
    let el_proxy = event_loop.create_proxy();
```

Replacement in src/lib.rs at line 207 [8.1268]

B:BD[3.1491] → [3.1491:1778]

            let (id, res) =
                winit_executor.spawn(async move { game.lock().unwrap().create_surface().await });
            if let Some(res) = res {
                res.unwrap()
            } else {
                el_proxy.send_event(PollTask(id)).unwrap();
            }

[3.1491]

[7.11268]

            winit_executor
                .spawn(async move { game.lock().unwrap().create_surface().await })
                .unwrap();

Replacement in justfile at line 7 [10.10716]

B:BD[9.25] → [2.0:33]

    cargo run --features desktop

[9.25]

[9.39]

    cargo run --features desktop --target-dir target-desktop

Replacement in justfile at line 11 [10.10716]

B:BD[10.10730] → [2.34:90]

    cargo run --features remote-profile,profile,desktop

[10.10730]

[10.10778]

    cargo run --features remote-profile,profile,desktop --target-dir target-desktop

Replacement in justfile at line 15 [10.10716]

B:BD[9.132] → [2.91:157]

    cargo run --release --features remote-profile,profile,desktop

[9.132]

[9.190]

    cargo run --release --features remote-profile,profile,desktop --target-dir target-desktop

Replacement in justfile at line 19 [10.10716]

B:BD[9.222] → [8.8535:8580]

    cargo build --release --features desktop

[9.222]

[8.8580]

    cargo build --release --features desktop --target-dir target-desktop

Replacement in Cargo.toml at line 27 [10.12025]

B:BD[11.3556] → [8.10378:10438]

leptos_reactive = { version = "0.6.5", features = ["csr"] }

[11.3556]

[10.12470]

# leptos_reactive = { version = "0.6.5", features = ["csr"] }

Replacement in Cargo.toml at line 32 [10.12025]
∅:D[12.6321] → [10.12485:12503]
∅:D[13.7045] → [10.12485:12503]
B:BD[10.12485] → [10.12485:12503]
```
piccolo = "0.3.1"
```
[13.7045]
[8.10439]
```
# piccolo = "0.3.1"
```
Replacement in Cargo.toml at line 53 [10.12025]
B:BD[14.3690] → [7.11817:11835]
```
oneshot = "0.1.6"
```
[14.3690]
[7.11835]
```
# oneshot = "0.1.6"
```
Insertion in Cargo.toml at line 57 [10.12025]
[15.872]
[8.10665]
```
ttf-parser = "0.20.0"
```
Replacement in Cargo.toml at line 72 [10.12025]
B:BD[10.12875] → [10.12875:12888]
```
default = []
```
[10.12875]
[10.12888]
```
default = ["cosmic-text/warn_on_missing_glyphs"]
```

Replacement in Cargo.toml at line 77 [10.12025]

B:BD[8.11048] → [15.873:950]

  "tracing-subscriber/time", "instant/wasm-bindgen", "cosmic-text/wasm-web"]

[8.11048]

[14.3778]

  "tracing-subscriber/time", "instant/wasm-bindgen", "cosmic-text/wasm-web", "cosmic-text/no_std",
  "cosmic-text/swash"]

Replacement in Cargo.toml at line 83 [10.12025]

B:BD[14.3901] → [15.951:1068]

desktop = ["egui-winit/default", "wgpu/default", "glyphon/default", "tracing-subscriber/env-filter", "dep:pollster"]

[14.3901]

[16.3856]

desktop = ["egui-winit/default", "wgpu/default", "glyphon/default", 
  "tracing-subscriber/env-filter", "dep:pollster"]

Deletion in Cargo.lock at line 428 [10.12974]
B:BD[11.333] → [8.11478:11498]
```
 "leptos_reactive",
```
Deletion in Cargo.lock at line 431 [10.12974]
B:BD[12.6403] → [7.11954:11966]
```
 "oneshot",
```
Deletion in Cargo.lock at line 432 [10.12974]
∅:D[12.6403] → [10.24203:24215]
∅:D[13.7067] → [10.24203:24215]
B:BD[10.24203] → [10.24203:24215]
```
 "piccolo",
```
Insertion in Cargo.lock at line 447 [10.12974]
[8.11599]
[9.395]
```
 "ttf-parser",
```
Insertion in Cargo.lock at line 710 [10.12974]
[10.31576]
[10.31576]
```
 "hashbrown",
```

Deletion in Cargo.lock at line 1291 [10.12974]

B:BD[8.14636] → [8.14636:14651]

∅:D[8.14651] → [10.45560:45795]

B:BD[10.45560] → [10.45560:45795]

B:BD[10.45795] → [17.9175:9189]

∅:D[17.9189] → [10.45816:46101]

B:BD[10.45816] → [10.45816:46101]

B:BD[10.46101] → [7.11981:12252]

]
[[package]]
name = "gc-arena"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57b2e43b3fc51b9900cc9ced1c4630dcbfae1859573102a84d2231ac744c1208"
dependencies = [
 "allocator-api2",
 "gc-arena-derive",
 "hashbrown",
 "sptr",
]
[[package]]
name = "gc-arena-derive"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96f3c487d429eaa928334f7f2ca7b14734f1c2f4020d2b08c1f0b4d9c70e4f17"
dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.48",
 "synstructure",
]
[[package]]
name = "generator"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
dependencies = [
 "cc",
 "libc",
 "log",
 "rustversion",
 "windows 0.48.0",

Replacement in Cargo.lock at line 1401 [10.12974]

B:BD[17.9208] → [15.1365:1480]

source = "git+https://github.com/Jengamon/glyphon.git?branch=bump-cosmic#f30bdabf19643b1c6588603c06c7f4fb73ca827e"

[17.9208]

[10.49074]

source = "git+https://github.com/Jengamon/glyphon.git?branch=bump-cosmic#75751138e9cee67f44e0f7f77ac535a2c97e75cb"

Deletion in Cargo.lock at line 1799 [10.12974]

B:BD[10.59056] → [10.59056:59069]

B:BD[10.59069] → [8.15012:15470]


[[package]]
name = "leptos_reactive"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b30c5bc7f3496d6ba399578171cf133c50d2172f9791fe292db4da2fd0d8cec4"
dependencies = [
 "base64",
 "cfg-if",
 "futures",
 "indexmap",
 "js-sys",
 "paste",
 "pin-project",
 "rustc-hash",
 "self_cell",
 "serde",
 "serde-wasm-bindgen",
 "serde_json",
 "slotmap",
 "thiserror",
 "tracing",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
]

Deletion in Cargo.lock at line 1870 [10.12974]

B:BD[10.61048] → [10.61048:61061]

B:BD[10.61061] → [7.12253:12536]


[[package]]
name = "loom"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
dependencies = [
 "cfg-if",
 "generator",
 "pin-utils",
 "scoped-tls",
 "tracing",
 "tracing-subscriber",
]

Replacement in Cargo.lock at line 2167 [10.12974]
B:BD[10.69034] → [10.69034:69053]
```
version = "0.2.17"
```
[10.69034]
[10.69053]
```
version = "0.2.18"
```

Replacement in Cargo.lock at line 2169 [10.12974]

B:BD[10.69118] → [10.69118:69196]

checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"

[10.69118]

[10.69196]

checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"

Deletion in Cargo.lock at line 2316 [10.12974]

B:BD[10.74287] → [7.12550:12769]

name = "oneshot"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f6640c6bda7731b1fdbab747981a0f896dd1fedaf9f4a53fa237a04a84431f4"
dependencies = [
 "loom",
]
[[package]]

Deletion in Cargo.lock at line 2444 [10.12974]

B:BD[13.8785] → [13.8785:8800]

∅:D[12.7450] → [10.77624:77872]

∅:D[13.8800] → [10.77624:77872]

B:BD[10.77624] → [10.77624:77872]

B:BD[10.77872] → [17.9848:9862]

∅:D[17.9862] → [10.77893:77931]

B:BD[10.77893] → [10.77893:77931]

B:BD[10.77931] → [8.16373:16861]

]
[[package]]
name = "piccolo"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93dd1815b42446904bb2689d1c5d7680e8c68113d5b15a5a3297ba6c7a5f84af"
dependencies = [
 "ahash",
 "allocator-api2",
 "anyhow",
 "gc-arena",
 "hashbrown",
 "rand",
 "thiserror",
]
[[package]]
name = "pin-project"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
dependencies = [
 "pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.48",

Deletion in Cargo.lock at line 2862 [10.12974]

B:BD[10.87229] → [10.87229:87242]

B:BD[10.87242] → [7.12770:12953]


[[package]]
name = "rustversion"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"

Deletion in Cargo.lock at line 2939 [10.12974]

B:BD[10.89771] → [10.89771:89786]

B:BD[10.89786] → [8.18079:18323]

]
[[package]]
name = "serde-wasm-bindgen"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132"
dependencies = [
 "js-sys",
 "serde",
 "wasm-bindgen",

Deletion in Cargo.lock at line 3005 [10.12974]
B:BD[10.91790] → [8.18339:18349]
```
 "serde",
```

Deletion in Cargo.lock at line 3076 [10.12974]

B:BD[10.94176] → [10.94176:94364]


[[package]]
name = "sptr"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"

Deletion in Cargo.lock at line 3253 [10.12974]
B:BD[10.97234] → [18.6630:6645]
B:BD[10.97249] → [10.97249:97271]
B:BD[10.97271] → [18.6852:6871]
∅:D[18.6871] → [10.97290:97355]
B:BD[10.97290] → [10.97290:97355]
B:BD[10.97355] → [18.6872:6950]
∅:D[18.6950] → [10.97433:97491]
B:BD[10.97433] → [10.97433:97491]
```
]
[[package]]
name = "synstructure"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.48",
```

Deletion in Cargo.lock at line 4074 [10.12974]

B:BD[7.13192] → [7.13192:13398]

∅:D[7.13398] → [10.120045:120077]

B:BD[10.120045] → [10.120045:120077]

version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
 "windows-targets 0.48.5",
]
[[package]]
name = "windows"

Replacement in .ignore at line 1 [10.135989]
B:BD[10.135989] → [10.135990:135998]
```
/target
```
[10.135989]
[10.135998]
```
/target*
```
Replacement in .gitignore at line 1 [19.35]
B:BD[19.35] → [19.36:44]
```
/target
```
[19.35]
[19.44]
```
/target*
```

trust the font process on desktop

Dependencies

In channels

Change contents

Insertion in src/text.rs at line 14 [4.32]

Replacement in src/text.rs at line 29 [4.32]

Replacement in src/text.rs at line 44 [4.32]

Replacement in src/text.rs at line 47 [4.32]

Replacement in src/text.rs at line 53 [4.32]

Replacement in src/text.rs at line 55 [4.32]

Deletion in src/text.rs at line 57 [4.32]

Insertion in src/lib.rs at line 39 [8.1268]

Replacement in src/lib.rs at line 66 [8.1268]

Replacement in src/lib.rs at line 69 [8.1268]

Replacement in src/lib.rs at line 73 [8.1268]

Deletion in src/lib.rs at line 157 [8.1268]

Replacement in src/lib.rs at line 207 [8.1268]

Replacement in justfile at line 7 [10.10716]

Replacement in justfile at line 11 [10.10716]

Replacement in justfile at line 15 [10.10716]

Replacement in justfile at line 19 [10.10716]

Replacement in Cargo.toml at line 27 [10.12025]

Replacement in Cargo.toml at line 32 [10.12025]

Replacement in Cargo.toml at line 53 [10.12025]

Insertion in Cargo.toml at line 57 [10.12025]

Replacement in Cargo.toml at line 72 [10.12025]

Replacement in Cargo.toml at line 77 [10.12025]

Replacement in Cargo.toml at line 83 [10.12025]

Deletion in Cargo.lock at line 428 [10.12974]

Deletion in Cargo.lock at line 431 [10.12974]

Deletion in Cargo.lock at line 432 [10.12974]

Insertion in Cargo.lock at line 447 [10.12974]

Insertion in Cargo.lock at line 710 [10.12974]

Deletion in Cargo.lock at line 1291 [10.12974]

Replacement in Cargo.lock at line 1401 [10.12974]

Deletion in Cargo.lock at line 1799 [10.12974]

Deletion in Cargo.lock at line 1870 [10.12974]

Replacement in Cargo.lock at line 2167 [10.12974]

Replacement in Cargo.lock at line 2169 [10.12974]

Deletion in Cargo.lock at line 2316 [10.12974]

Deletion in Cargo.lock at line 2444 [10.12974]

Deletion in Cargo.lock at line 2862 [10.12974]

Deletion in Cargo.lock at line 2939 [10.12974]

Deletion in Cargo.lock at line 3005 [10.12974]

Deletion in Cargo.lock at line 3076 [10.12974]

Deletion in Cargo.lock at line 3253 [10.12974]

Deletion in Cargo.lock at line 4074 [10.12974]

Replacement in .ignore at line 1 [10.135989]

Replacement in .gitignore at line 1 [19.35]