Skip to content

Commit

Permalink
Merge pull request #100 from coolyjg/CI-warnings
Browse files Browse the repository at this point in the history
Format code and Fix warnings
  • Loading branch information
ken4647 authored Apr 29, 2024
2 parents 8e47a1f + 279e371 commit 34d4927
Show file tree
Hide file tree
Showing 50 changed files with 53 additions and 1,309 deletions.
8 changes: 8 additions & 0 deletions Cargo.lock

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

8 changes: 0 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ members = [
"crates/axfs_vfs",
"crates/axio",
"crates/capability",
"crates/crate_interface",
"crates/driver_9p",
"crates/driver_block",
"crates/driver_common",
Expand All @@ -22,11 +21,8 @@ members = [
"crates/driver_virtio",
"crates/dtb",
"crates/flatten_objects",
"crates/handler_table",
"crates/kernel_guard",
"crates/lazy_init",
"crates/linked_list",
"crates/memory_addr",
"crates/page_table",
"crates/page_table_entry",
"crates/percpu",
Expand Down Expand Up @@ -71,7 +67,3 @@ lto = true
[profile.reldebug]
inherits = "release"
debug = true


[patch.crates-io]
crate_interface = { path = "crates/crate_interface" }
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RuxOS was inspired by [Unikraft](https://github.com/unikraft/unikraft) and [Arce
* [x] SMP scheduling with single run queue
* [x] File system
* [x] Compatible with Linux apps
* [x] Dynamically loading apps
* [ ] Interrupt driven device I/O
* [ ] Async I/O

Expand Down Expand Up @@ -63,6 +64,9 @@ The currently supported applications (Rust), as well as their dependent modules
| [iperf](apps/c/iperf/) | alloc, paging, net, fs, blkfs, select, fp_simd | A network performance test tool |
| [redis](apps/c/redis/) | alloc, paging, fp_simd, irq, multitask, fs, blkfs, net, pipe, epoll, poll, virtio-9p, rtc | A Redis server on Ruxos |
| [sqlite3](apps/c/sqlite3/) | alloc, paging, fs, fp_simd, blkfs | A simple test for Sqlite3 API |
| [cpp](apps/c/cpp/) | alloc, paging, irq, multitask, fs, random-hw | C++ benchmark |
| [dl](apps/c/dl/) | paging, alloc, irq, musl, multitask, fs, pipe, poll, rtc, signal, virtio-9p | An example for dynamically loading apps |


## Build & Run

Expand Down
6 changes: 3 additions & 3 deletions api/ruxos_posix_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ authors = [
"Shiping Yuan <robert_yuan@pku.edu.com>",
]
description = "POSIX-compatible APIs for Ruxos modules"
license = "GPL-3.0-or-later OR Apache-2.0"
license = "Mulan PSL v2"
repository = "https://github.com/syswonder/ruxos/tree/main/api/ruxos_posix_api"

[features]
Expand Down Expand Up @@ -52,14 +52,14 @@ axnet = { path = "../../modules/axnet", optional = true }
# Other crates
axio = { path = "../../crates/axio" }
axerrno = { path = "../../crates/axerrno" }
memory_addr = { path = "../../crates/memory_addr" }
memory_addr = "0.1.0"
static_assertions = "1.1.0"
spin = { version = "0.9" }
spinlock = { path = "../../crates/spinlock" }
lazy_static = { version = "1.4", features = ["spin_no_std"] }
flatten_objects = { path = "../../crates/flatten_objects" }
page_table = { path = "../../crates/page_table" }
crate_interface = { path = "../../crates/crate_interface" }
crate_interface = "0.1.1"

cfg-if = "1.0"
elf = { version = "0.7", default-features = false }
Expand Down
1 change: 0 additions & 1 deletion api/ruxos_posix_api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

#![cfg_attr(all(not(test), not(doc)), no_std)]
#![feature(ip_in_core)]
#![feature(result_option_inspect)]
#![feature(doc_cfg)]
#![feature(doc_auto_cfg)]
#![allow(clippy::missing_safety_doc)]
Expand Down
2 changes: 1 addition & 1 deletion apps/c/dl/features.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ pipe
poll
rtc
signal
virtio-9p
virtio-9p
2 changes: 1 addition & 1 deletion apps/fs/shell/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ default = []
[dependencies]
axfs_vfs = { path = "../../../crates/axfs_vfs", optional = true }
axfs_ramfs = { path = "../../../crates/axfs_ramfs", optional = true }
crate_interface = { path = "../../../crates/crate_interface", optional = true }
crate_interface = { version = "0.1.1", optional = true }
axstd = { path = "../../../ulib/axstd", features = ["alloc", "fs","blkfs"], optional = true }
1 change: 0 additions & 1 deletion crates/allocator/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
//! - [`IdAllocator`]: Used to allocate unique IDs.

#![no_std]
#![feature(result_option_inspect)]
#![cfg_attr(feature = "allocator_api", feature(allocator_api))]

#[cfg(feature = "bitmap")]
Expand Down
20 changes: 0 additions & 20 deletions crates/crate_interface/Cargo.toml

This file was deleted.

38 changes: 0 additions & 38 deletions crates/crate_interface/README.md

This file was deleted.

196 changes: 0 additions & 196 deletions crates/crate_interface/src/lib.rs

This file was deleted.

Loading

0 comments on commit 34d4927

Please sign in to comment.