merge rcore-os master

.github/workflows/deploy.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - dev
 
 jobs:
   deploy:

.github/workflows/main.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - dev
 
 jobs:
   check:
@@ -33,6 +32,10 @@ jobs:
           cargo clippy
           cd ch02-03
           cargo clippy
+          cd ../ch03-02
+          cargo clippy
+          cd ../ch03-04
+          cargo clippy          
 #        uses: actions-rs/cargo@v1
 #        with:
 #          command: clippy
@@ -57,6 +60,10 @@ jobs:
           cargo build
           cd ch02-03
           cargo build
+          cd ../ch03-02
+          cargo build          
+          cd ../ch03-04
+          cargo build               
 #        uses: actions-rs/cargo@v1
 #        with:
 #          command: build  
@@ -81,7 +88,10 @@ jobs:
           cargo test
           cd ch02-03
           cargo test
-
+          cd ../ch03-02
+          cargo test          
+          cd ../ch03-04
+          cargo test                
   doc:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -103,3 +113,7 @@ jobs:
           cargo doc --no-deps --all-features
           cd ch02-03
           cargo doc --no-deps --all-features
+          cd ../ch03-02
+          cargo doc --no-deps --all-features          
+          cd ../ch03-04
+          cargo doc --no-deps --all-features           

code/ch03-04/object/Cargo.toml

@@ -17,4 +17,4 @@ futures = { version = "0.3", default-features = false, features = ["alloc", "asy
 async-std = { version = "1.9", features = ["attributes", "unstable"] }
 numeric-enum-macro = "0.2"
 kernel-hal = { path = "../kernel-hal" }
-kernel-hal-unix = { path = "../kernel-hal-unix" }
+kernel-hal-unix = { path = "../kernel-hal-unix" }