diff --git a/src/android/aidl/deploy.md b/src/android/aidl/deploy.md index 3b55fae3..62306f8b 100644 --- a/src/android/aidl/deploy.md +++ b/src/android/aidl/deploy.md @@ -16,7 +16,10 @@ Service birthdayservice: found You can also call the service with `service call`: ```shell -$ {{#include ../build_all.sh:service_call_birthday_server}} +{{#include ../build_all.sh:service_call_birthday_server}} +``` + +``` Result: Parcel( 0x00000000: 00000000 00000036 00610048 00700070 '....6...H.a.p.p.' 0x00000010: 00200079 00690042 00740072 00640068 'y. .B.i.r.t.h.d.' diff --git a/src/android/logging.md b/src/android/logging.md index 3a3feb19..55b12a56 100644 --- a/src/android/logging.md +++ b/src/android/logging.md @@ -24,7 +24,10 @@ Build, push, and run the binary on your device: The logs show up in `adb logcat`: ```shell -$ adb logcat -s rust +adb logcat -s rust +``` + +``` 09-08 08:38:32.454 2420 2420 D rust: hello_rust_logs: Starting program. 09-08 08:38:32.454 2420 2420 I rust: hello_rust_logs: Things are going fine. 09-08 08:38:32.454 2420 2420 E rust: hello_rust_logs: Something went wrong! diff --git a/src/android/setup.md b/src/android/setup.md index ae1bded5..407e75c5 100644 --- a/src/android/setup.md +++ b/src/android/setup.md @@ -4,9 +4,9 @@ We will be using an Android Virtual Device to test our code. Make sure you have access to one or create a new one with: ```shell -$ source build/envsetup.sh -$ lunch aosp_cf_x86_64_phone-userdebug -$ acloud create +source build/envsetup.sh +lunch aosp_cf_x86_64_phone-userdebug +acloud create ``` Please see the [Android Developer diff --git a/src/cargo.md b/src/cargo.md index 4384e90b..bb076f88 100644 --- a/src/cargo.md +++ b/src/cargo.md @@ -20,7 +20,7 @@ Along with cargo and rustc, Rustup will install itself as a command line utility On Debian/Ubuntu, you can install Cargo, the Rust source and the [Rust formatter][6] with ```shell -$ sudo apt install cargo rust-src rustfmt +sudo apt install cargo rust-src rustfmt ``` This will allow [rust-analyzer][1] to jump to the definitions. We suggest using diff --git a/src/exercises/concurrency/chat-app.md b/src/exercises/concurrency/chat-app.md index a344d27b..5a0e7516 100644 --- a/src/exercises/concurrency/chat-app.md +++ b/src/exercises/concurrency/chat-app.md @@ -77,13 +77,13 @@ described below. Run the server with: ```shell -$ cargo run --bin server +cargo run --bin server ``` and the client with: ```shell -$ cargo run --bin client +cargo run --bin client ``` ## Tasks diff --git a/src/exercises/concurrency/link-checker.md b/src/exercises/concurrency/link-checker.md index 48896c22..71e42191 100644 --- a/src/exercises/concurrency/link-checker.md +++ b/src/exercises/concurrency/link-checker.md @@ -9,9 +9,9 @@ For this, you will need an HTTP client such as [`reqwest`][1]. Create a new Cargo project and `reqwest` it as a dependency with: ```shell -$ cargo new link-checker -$ cd link-checker -$ cargo add --features blocking,rustls-tls reqwest +cargo new link-checker +cd link-checker +cargo add --features blocking,rustls-tls reqwest ``` > If `cargo add` fails with `error: no such subcommand`, then please edit the @@ -20,14 +20,14 @@ $ cargo add --features blocking,rustls-tls reqwest You will also need a way to find links. We can use [`scraper`][2] for that: ```shell -$ cargo add scraper +cargo add scraper ``` Finally, we'll need some way of handling errors. We use [`thiserror`][3] for that: ```shell -$ cargo add thiserror +cargo add thiserror ``` The `cargo add` calls will update the `Cargo.toml` file to look like this: @@ -72,7 +72,7 @@ fn main() { Run the code in `src/main.rs` with ```shell -$ cargo run +cargo run ``` ## Tasks