From 6f21c1a88dd8c0fcf1d446df0d3a25fd2acdb773 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 03:52:00 +0000
Subject: [PATCH] Bump zerocopy from 0.5.0 to 0.5.2 in /tlibc

Bumps [zerocopy](https://github.com/google/zerocopy) from 0.5.0 to 0.5.2.
- [Release notes](https://github.com/google/zerocopy/releases)
- [Changelog](https://github.com/google/zerocopy/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/zerocopy/commits)

---
updated-dependencies:
- dependency-name: zerocopy
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tlibc/Cargo.lock | 372 ++++++++++++++++++++++++++++-------------------
 1 file changed, 220 insertions(+), 152 deletions(-)

diff --git a/tlibc/Cargo.lock b/tlibc/Cargo.lock
index 0cff8ebc0f..96b9163f3f 100644
--- a/tlibc/Cargo.lock
+++ b/tlibc/Cargo.lock
@@ -2,6 +2,51 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "acpi"
+version = "0.1.0"
+dependencies = [
+ "acpi_table",
+ "acpi_table_handler",
+ "dmar",
+ "fadt",
+ "hpet",
+ "iommu",
+ "log",
+ "madt",
+ "memory",
+ "rsdp",
+ "rsdt",
+ "spin 0.9.4",
+ "time",
+ "waet",
+]
+
+[[package]]
+name = "acpi_table"
+version = "0.1.0"
+dependencies = [
+ "log",
+ "memory",
+ "sdt",
+ "zerocopy",
+]
+
+[[package]]
+name = "acpi_table_handler"
+version = "0.1.0"
+dependencies = [
+ "acpi_table",
+ "dmar",
+ "fadt",
+ "hpet",
+ "log",
+ "madt",
+ "memory",
+ "rsdt",
+ "waet",
+]
+
 [[package]]
 name = "ahash"
 version = "0.7.6"
@@ -57,20 +102,6 @@ dependencies = [
  "memory_structs",
 ]
 
-[[package]]
-name = "async_channel"
-version = "0.1.0"
-dependencies = [
- "core2",
- "crossbeam-utils",
- "debugit",
- "log",
- "mpmc",
- "sync",
- "sync_spin",
- "wait_queue",
-]
-
 [[package]]
 name = "atomic_linked_list"
 version = "0.1.0"
@@ -107,6 +138,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
 [[package]]
 name = "block_allocator"
 version = "0.1.0"
@@ -118,7 +155,7 @@ dependencies = [
 name = "boot_info"
 version = "0.1.0"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
  "kernel_config",
  "memory_structs",
 ]
@@ -175,6 +212,17 @@ dependencies = [
  "x86_64",
 ]
 
+[[package]]
+name = "cls_allocator"
+version = "0.1.0"
+dependencies = [
+ "cpu",
+ "crate_metadata",
+ "irq_safety",
+ "local_storage_initializer",
+ "sync_spin",
+]
+
 [[package]]
 name = "cls_macros"
 version = "0.1.0"
@@ -380,6 +428,17 @@ dependencies = [
  "syn 1.0.98",
 ]
 
+[[package]]
+name = "dmar"
+version = "0.1.0"
+dependencies = [
+ "acpi_table",
+ "log",
+ "memory",
+ "sdt",
+ "zerocopy",
+]
+
 [[package]]
 name = "early_printer"
 version = "0.1.0"
@@ -398,8 +457,8 @@ dependencies = [
 name = "early_tls"
 version = "0.1.0"
 dependencies = [
+ "local_storage_initializer",
  "spin 0.9.4",
- "tls_initializer",
 ]
 
 [[package]]
@@ -441,6 +500,16 @@ dependencies = [
  "spin 0.9.4",
 ]
 
+[[package]]
+name = "fadt"
+version = "0.1.0"
+dependencies = [
+ "acpi_table",
+ "memory",
+ "sdt",
+ "zerocopy",
+]
+
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -497,7 +566,7 @@ version = "0.1.0"
 dependencies = [
  "atomic_linked_list",
  "bit_field 0.7.0",
- "bitflags",
+ "bitflags 2.4.1",
  "cpu",
  "log",
  "memory",
@@ -506,6 +575,18 @@ dependencies = [
  "x86_64",
 ]
 
+[[package]]
+name = "generic_timer_aarch64"
+version = "0.1.0"
+dependencies = [
+ "cortex-a",
+ "derive_more",
+ "log",
+ "memory_structs",
+ "time",
+ "tock-registers",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.4"
@@ -525,7 +606,8 @@ dependencies = [
  "cpu",
  "log",
  "memory",
- "static_assertions",
+ "spin 0.9.4",
+ "volatile 0.2.7",
  "zerocopy",
 ]
 
@@ -567,17 +649,36 @@ dependencies = [
  "sync_irq",
 ]
 
+[[package]]
+name = "hpet"
+version = "0.1.0"
+dependencies = [
+ "acpi_table",
+ "kernel_config",
+ "log",
+ "memory",
+ "sdt",
+ "spin 0.9.4",
+ "time",
+ "volatile 0.2.7",
+ "zerocopy",
+]
+
 [[package]]
 name = "interrupt_controller"
 version = "0.1.0"
 dependencies = [
+ "acpi",
  "apic",
  "arm_boards",
  "cpu",
+ "generic_timer_aarch64",
  "gic",
  "ioapic",
  "log",
+ "madt",
  "memory",
+ "spin 0.9.4",
  "sync_irq",
 ]
 
@@ -592,6 +693,7 @@ dependencies = [
  "early_printer",
  "exceptions_early",
  "gdt",
+ "generic_timer_aarch64",
  "gic",
  "interrupt_controller",
  "kernel_config",
@@ -601,7 +703,6 @@ dependencies = [
  "pic",
  "spin 0.9.4",
  "sync_irq",
- "time",
  "tock-registers",
  "tss",
  "x86_64",
@@ -641,6 +742,19 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "iommu"
+version = "0.1.0"
+dependencies = [
+ "bitflags 2.4.1",
+ "log",
+ "memory",
+ "spin 0.9.4",
+ "sync_irq",
+ "volatile 0.2.7",
+ "zerocopy",
+]
+
 [[package]]
 name = "irq_safety"
 version = "0.1.1"
@@ -668,7 +782,7 @@ version = "0.1.0"
 name = "keycodes_ascii"
 version = "0.1.0"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
  "num_enum",
 ]
 
@@ -692,6 +806,20 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "549ce1740e46b291953c4340adcd74c59bcf4308f4cac050fd33ba91b7168f4a"
 
+[[package]]
+name = "local_storage_initializer"
+version = "0.1.0"
+dependencies = [
+ "cortex-a",
+ "crate_metadata",
+ "log",
+ "memory_structs",
+ "rangemap",
+ "spin 0.9.4",
+ "tock-registers",
+ "x86_64",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.2"
@@ -736,6 +864,20 @@ dependencies = [
  "sync_irq",
 ]
 
+[[package]]
+name = "madt"
+version = "0.1.0"
+dependencies = [
+ "acpi_table",
+ "apic",
+ "ioapic",
+ "log",
+ "memory",
+ "pic",
+ "sdt",
+ "zerocopy",
+]
+
 [[package]]
 name = "memchr"
 version = "2.4.1"
@@ -769,7 +911,7 @@ version = "0.1.0"
 dependencies = [
  "atomic_linked_list",
  "bit_field 0.7.0",
- "bitflags",
+ "bitflags 2.4.1",
  "boot_info",
  "frame_allocator",
  "kernel_config",
@@ -833,6 +975,7 @@ version = "0.1.0"
 dependencies = [
  "bincode",
  "bootloader_modules",
+ "cls_allocator",
  "const_format",
  "cow_arc",
  "crate_metadata",
@@ -843,6 +986,7 @@ dependencies = [
  "fs_node",
  "hashbrown",
  "kernel_config",
+ "local_storage_initializer",
  "log",
  "memfs",
  "memory",
@@ -853,7 +997,6 @@ dependencies = [
  "rustc-demangle",
  "serde",
  "spin 0.9.4",
- "tls_initializer",
  "vfs_node",
  "xmas-elf",
 ]
@@ -1012,7 +1155,6 @@ dependencies = [
  "log",
  "memory",
  "mod_mgmt",
- "runqueue",
  "stack_trace",
  "stack_trace_frame_pointers",
  "task",
@@ -1030,11 +1172,7 @@ name = "path"
 version = "0.1.0"
 dependencies = [
  "fs_node",
- "lazy_static",
- "log",
  "root",
- "spin 0.9.4",
- "vfs_node",
 ]
 
 [[package]]
@@ -1054,15 +1192,6 @@ dependencies = [
  "spin 0.9.4",
 ]
 
-[[package]]
-name = "pl011"
-version = "1.0.0"
-source = "git+https://github.com/theseus-os/pl011/?rev=464dbf22#464dbf2288a5d9e7445b0b1f404ddd41b1fd1c1e"
-dependencies = [
- "log",
- "volatile-register",
-]
-
 [[package]]
 name = "plain"
 version = "0.2.3"
@@ -1095,7 +1224,7 @@ dependencies = [
 name = "pte_flags"
 version = "0.1.0"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
  "cfg-if 1.0.0",
 ]
 
@@ -1134,7 +1263,7 @@ version = "10.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -1148,52 +1277,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "runqueue"
+name = "rsdp"
 version = "0.1.0"
 dependencies = [
- "atomic_linked_list",
- "cfg-if 1.0.0",
- "lazy_static",
- "log",
- "runqueue_epoch",
- "runqueue_priority",
- "runqueue_round_robin",
- "single_simd_task_optimization",
- "sync_preemption",
- "task",
-]
-
-[[package]]
-name = "runqueue_epoch"
-version = "0.1.0"
-dependencies = [
- "atomic_linked_list",
- "log",
- "single_simd_task_optimization",
- "sync_preemption",
- "task",
-]
-
-[[package]]
-name = "runqueue_priority"
-version = "0.1.0"
-dependencies = [
- "atomic_linked_list",
- "log",
- "sync_preemption",
- "task",
- "time",
+ "memory",
+ "zerocopy",
 ]
 
 [[package]]
-name = "runqueue_round_robin"
+name = "rsdt"
 version = "0.1.0"
 dependencies = [
- "atomic_linked_list",
- "log",
- "single_simd_task_optimization",
- "sync_preemption",
- "task",
+ "acpi_table",
+ "memory",
+ "sdt",
 ]
 
 [[package]]
@@ -1223,46 +1320,14 @@ version = "0.1.0"
 dependencies = [
  "cfg-if 1.0.0",
  "cpu",
+ "generic_timer_aarch64",
  "interrupts",
+ "kernel_config",
  "log",
- "scheduler_epoch",
- "scheduler_priority",
- "scheduler_round_robin",
  "sleep",
- "task",
- "x86_64",
-]
-
-[[package]]
-name = "scheduler_epoch"
-version = "0.1.0"
-dependencies = [
- "log",
- "runqueue",
- "runqueue_epoch",
- "spin 0.9.4",
- "task",
-]
-
-[[package]]
-name = "scheduler_priority"
-version = "0.1.0"
-dependencies = [
- "log",
- "runqueue_priority",
- "task",
- "time",
-]
-
-[[package]]
-name = "scheduler_round_robin"
-version = "0.1.0"
-dependencies = [
- "log",
- "runqueue",
- "runqueue_round_robin",
  "spin 0.9.4",
  "task",
+ "x86_64",
 ]
 
 [[package]]
@@ -1280,6 +1345,13 @@ dependencies = [
  "rustc_version",
 ]
 
+[[package]]
+name = "sdt"
+version = "0.1.0"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -1320,20 +1392,10 @@ name = "serial_port_basic"
 version = "0.1.0"
 dependencies = [
  "arm_boards",
- "memory",
- "pl011",
  "port_io",
  "spin 0.9.4",
  "sync_irq",
-]
-
-[[package]]
-name = "single_simd_task_optimization"
-version = "0.1.0"
-dependencies = [
- "cfg-if 0.1.10",
- "log",
- "task",
+ "uart_pl011",
 ]
 
 [[package]]
@@ -1468,6 +1530,20 @@ dependencies = [
  "wait_queue",
 ]
 
+[[package]]
+name = "sync_channel"
+version = "0.1.0"
+dependencies = [
+ "core2",
+ "crossbeam-utils",
+ "debugit",
+ "log",
+ "mpmc",
+ "sync",
+ "sync_spin",
+ "wait_queue",
+]
+
 [[package]]
 name = "sync_irq"
 version = "0.1.0"
@@ -1522,6 +1598,7 @@ dependencies = [
  "stack",
  "static_assertions",
  "sync_irq",
+ "sync_preemption",
  "task_struct",
  "waker_generic",
 ]
@@ -1569,20 +1646,6 @@ dependencies = [
  "task",
 ]
 
-[[package]]
-name = "tls_initializer"
-version = "0.1.0"
-dependencies = [
- "cortex-a",
- "crate_metadata",
- "log",
- "memory_structs",
- "rangemap",
- "spin 0.9.4",
- "tock-registers",
- "x86_64",
-]
-
 [[package]]
 name = "tock-registers"
 version = "0.7.0"
@@ -1605,9 +1668,19 @@ dependencies = [
 name = "tty"
 version = "0.1.0"
 dependencies = [
- "async_channel",
  "core2",
  "sync_block",
+ "sync_channel",
+]
+
+[[package]]
+name = "uart_pl011"
+version = "0.1.0"
+dependencies = [
+ "log",
+ "memory",
+ "volatile 0.2.7",
+ "zerocopy",
 ]
 
 [[package]]
@@ -1651,12 +1724,6 @@ dependencies = [
  "task",
 ]
 
-[[package]]
-name = "vcell"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -1701,12 +1768,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0"
 
 [[package]]
-name = "volatile-register"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6"
+name = "waet"
+version = "0.1.0"
 dependencies = [
- "vcell",
+ "acpi_table",
+ "memory",
+ "sdt",
+ "zerocopy",
 ]
 
 [[package]]
@@ -1742,7 +1810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "958cd5cb28e720db2f59ee9dc4235b5f82a183d079fb0e6caf43ad074cfdc66a"
 dependencies = [
  "bit_field 0.10.1",
- "bitflags",
+ "bitflags 1.3.2",
  "rustversion",
  "volatile 0.4.4",
 ]
@@ -1762,9 +1830,9 @@ source = "git+https://github.com/theseus-os/zero.git#9fc7ff523138a21f40359b706d2
 
 [[package]]
 name = "zerocopy"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e59ec1d2457bd6c0dd89b50e7d9d6b0b647809bf3f0a59ac85557046950b7b2"
+checksum = "4d497797928c195a67ad29428cc6db3bb3b38fa2d520be13637bde0ceb91c696"
 dependencies = [
  "byteorder",
  "zerocopy-derive",