Skip to content

Commit

Permalink
Upgrade lazy_static to 1.4.0 (theseus-os#450)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinaboos authored Oct 13, 2021
1 parent e5f1289 commit d172f36
Show file tree
Hide file tree
Showing 43 changed files with 79 additions and 90 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions applications/app_io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ path = "../../kernel/window_manager"
path = "../../kernel/libterm"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.stdio]
path = "../../libs/stdio"
Expand Down
4 changes: 2 additions & 2 deletions applications/shell/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ path = "../../kernel/scheduler"
path = "../../libs/stdio"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.app_io]
path = "../app_io"
Expand Down
4 changes: 2 additions & 2 deletions applications/test_downtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ path = "../../kernel/rendezvous"
path = "../../kernel/async_channel"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

# for WM

Expand Down
4 changes: 2 additions & 2 deletions applications/test_restartable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ default-features = false
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.spawn]
path = "../../kernel/spawn"
Expand Down
4 changes: 2 additions & 2 deletions kernel/acpi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ volatile = "0.2.7"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/ap_start/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "../../build.rs"
spin = "0.9.0"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.log]
version = "0.4.8"
Expand Down
4 changes: 2 additions & 2 deletions kernel/apic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ static_assertions = "1.1.0"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/block_cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ build = "../../build.rs"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.hashbrown]
version = "0.9.1"
Expand Down
4 changes: 2 additions & 2 deletions kernel/crate_swap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ by_address = "1.0.4"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.hashbrown]
version = "0.9.1"
Expand Down
4 changes: 2 additions & 2 deletions kernel/e1000/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ static_assertions = "1.1.0"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/ethernet_smoltcp_device/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ owning_ref = { git = "https://github.com/theseus-os/owning-ref-rs" }
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"


[dependencies.smoltcp]
Expand Down
4 changes: 2 additions & 2 deletions kernel/fault_log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ build = "../../build.rs"


[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/framebuffer_compositor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ path = "../shapes"
path = "../compositor"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.hashbrown]
version = "0.9.1"
Expand Down
2 changes: 1 addition & 1 deletion kernel/fs_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ x86_64 = { path = "../../libs/x86_64" } # currently using our local copy, forked

[dependencies.lazy_static]
features = ["spin_no_std"]
version = "1.0"
version = "1.4.0"

[dependencies.log]
version = "0.4.8"
Expand Down
4 changes: 2 additions & 2 deletions kernel/gdt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ bitflags = "1.1.0"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.atomic_linked_list]
path = "../../libs/atomic_linked_list"
Expand Down
4 changes: 2 additions & 2 deletions kernel/interrupts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ x86_64 = { path = "../../libs/x86_64" } # currently using our local copy, forked
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ default-features = false
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.lockable]
path = "../../libs/lockable"
Expand Down
4 changes: 2 additions & 2 deletions kernel/ioapic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ owning_ref = { git = "https://github.com/theseus-os/owning-ref-rs" }
zerocopy = "0.5.0"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.atomic_linked_list]
path = "../../libs/atomic_linked_list"
Expand Down
2 changes: 1 addition & 1 deletion kernel/ixgbe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std"]
version = "1.0"
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/mapper_spillful/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cfg-if = "0.1.6"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/memory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ zerocopy = "0.5.0"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
6 changes: 0 additions & 6 deletions kernel/mouse/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ version = "0.4.8"
[dependencies.mouse_data]
path = "../../libs/mouse_data"


# [dependencies.lazy_static]
# features = ["spin_no_std", "nightly"]
# version = "0.2.1"


[dependencies.ps2]
path = "../ps2"

Expand Down
4 changes: 2 additions & 2 deletions kernel/network_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ owning_ref = { git = "https://github.com/theseus-os/owning-ref-rs" }
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.e1000]
path = "../e1000"
Expand Down
2 changes: 1 addition & 1 deletion kernel/path/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ x86_64 = { path = "../../libs/x86_64" } # currently using our local copy, forked

[dependencies.lazy_static]
features = ["spin_no_std"]
version = "1.0"
version = "1.4.0"

[dependencies.fs_node]
path = "../fs_node"
Expand Down
4 changes: 2 additions & 2 deletions kernel/pmu_x86/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ path = "../apic"
git = "https://github.com/theseus-os/irq_safety"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.log]
version = "0.4.8"
Expand Down
2 changes: 1 addition & 1 deletion kernel/root/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ x86_64 = { path = "../../libs/x86_64" } # currently using our local copy, forked

[dependencies.lazy_static]
features = ["spin_no_std"]
version = "1.0"
version = "1.4.0"

[dependencies.fs_node]
path = "../fs_node"
Expand Down
4 changes: 2 additions & 2 deletions kernel/rtc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ spin = "0.9.0"
x86_64 = { path = "../../libs/x86_64" }

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.log]
version = "0.4.8"
Expand Down
4 changes: 2 additions & 2 deletions kernel/runqueue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ build = "../../build.rs"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/runqueue_priority/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ build = "../../build.rs"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/runqueue_round_robin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ build = "../../build.rs"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/spawn/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ build = "../../build.rs"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.irq_safety]
git = "https://github.com/theseus-os/irq_safety"
Expand Down
4 changes: 2 additions & 2 deletions kernel/state_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ build = "../../build.rs"
spin = "0.9.0"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.atomic_linked_list]
path = "../../libs/atomic_linked_list"
Expand Down
4 changes: 2 additions & 2 deletions kernel/state_transfer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ spin = "0.9.0"
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.atomic_linked_list]
path = "../../libs/atomic_linked_list"
Expand Down
4 changes: 2 additions & 2 deletions kernel/storage_device/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ downcast-rs = { version = "1.2.0", default-features = false }
version = "0.4.8"

[dependencies.lazy_static]
features = ["spin_no_std", "nightly"]
version = "1.2.0"
features = ["spin_no_std"]
version = "1.4.0"

[dependencies.io]
path = "../io"
Expand Down
Loading

0 comments on commit d172f36

Please sign in to comment.