big changes updated code

rust-lang-uz · Nov 25, 2023 · 4b9ebff · 4b9ebff
1 parent 435ff00
commit 4b9ebff
Show file tree

Hide file tree

Showing 34 changed files with 74 additions and 76 deletions.
diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml
diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml
diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs
diff --git a/...-about-cargo/listing-14-07/add/Cargo.lock → ...ut-cargo/listing-14-07/qoshish/Cargo.lock b/...-about-cargo/listing-14-07/add/Cargo.lock → ...ut-cargo/listing-14-07/qoshish/Cargo.lock
diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/qoshish/Cargo.toml b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/qoshish/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "qoshuvchi",
+    "bitta_qoshish",
+]
diff --git a/...argo/listing-14-07/add/add_one/Cargo.toml → ...ng-14-07/qoshish/bitta_qoshish/Cargo.toml b/...argo/listing-14-07/add/add_one/Cargo.toml → ...ng-14-07/qoshish/bitta_qoshish/Cargo.toml
diff --git a/...argo/listing-14-07/add/add_one/src/lib.rs → ...ng-14-07/qoshish/bitta_qoshish/src/lib.rs b/...argo/listing-14-07/add/add_one/src/lib.rs → ...ng-14-07/qoshish/bitta_qoshish/src/lib.rs
diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/qoshish/qoshuvchi/Cargo.toml b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/qoshish/qoshuvchi/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "qoshish"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+
+bitta_qoshish = { path = "../bitta_qoshish" }
diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/qoshish/qoshuvchi/src/main.rs b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-07/qoshish/qoshuvchi/src/main.rs
@@ -0,0 +1,6 @@
+use bitta_qoshish;
+
+fn main() {
+    let raqam = 10;
+    println!("Salom, Rust! {raqam} plyus bir {} ga teng!!", bitta_qoshish::bitta_qoshish(raqam));
+}
diff --git a/...ings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs b/...ings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs
diff --git a/...workspace-with-adder-crate/add/Cargo.lock → ...space-with-adder-crate/qoshish/Cargo.lock b/...workspace-with-adder-crate/add/Cargo.lock → ...space-with-adder-crate/qoshish/Cargo.lock
diff --git a/...workspace-with-adder-crate/add/Cargo.toml → ...space-with-adder-crate/qoshish/Cargo.toml b/...workspace-with-adder-crate/add/Cargo.toml → ...space-with-adder-crate/qoshish/Cargo.toml
diff --git a/...ace-with-adder-crate/add/adder/Cargo.toml → ...-adder-crate/qoshish/qoshuvchi/Cargo.toml b/...ace-with-adder-crate/add/adder/Cargo.toml → ...-adder-crate/qoshish/qoshuvchi/Cargo.toml
diff --git a/...4-more-about-cargo/no-listing-01-workspace-with-adder-crate/qoshish/qoshuvchi/src/main.rs b/...4-more-about-cargo/no-listing-01-workspace-with-adder-crate/qoshish/qoshuvchi/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Orzularing o'zingnikimi?");
+}
diff --git a/...-uz/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml b/...-uz/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml
diff --git a/...ings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add_one/src/lib.rs b/...ings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add_one/src/lib.rs
diff --git a/...stings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml b/...stings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml
diff --git a/...tings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/src/main.rs b/...tings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/src/main.rs
diff --git a/...-workspace-with-two-crates/add/Cargo.lock → ...kspace-with-two-crates/qoshish/Cargo.lock b/...-workspace-with-two-crates/add/Cargo.lock → ...kspace-with-two-crates/qoshish/Cargo.lock
diff --git a/...listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/Cargo.toml b/...listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "qoshuvchi",
+    "bitta_qoshish",
+]
diff --git a/...ce-with-two-crates/add/add_one/Cargo.toml → ...o-crates/qoshish/bitta_qoshish/Cargo.toml b/...ce-with-two-crates/add/add_one/Cargo.toml → ...o-crates/qoshish/bitta_qoshish/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "add_one"
+name = "bitta_qoshish"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/...more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/bitta_qoshish/src/lib.rs b/...more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/bitta_qoshish/src/lib.rs
@@ -0,0 +1,3 @@
+pub fn bitta_qoshish(x: i32) -> i32 {
+    x + 1
+}
diff --git a/...h14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/qoshuvchi/Cargo.toml b/...h14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/qoshuvchi/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "qoshuvchi"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bitta_qoshish = { path = "../bitta_qoshish" }
diff --git a/...14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/qoshuvchi/src/main.rs b/...14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/qoshuvchi/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Orzularing o'zingnikimi?");
+}
diff --git a/...ngs/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml b/...ngs/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml
diff --git a/...-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add_one/src/lib.rs b/...-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add_one/src/lib.rs
diff --git a/...14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/Cargo.toml b/...14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/Cargo.toml
diff --git a/...e-with-external-dependency/add/Cargo.lock → ...th-external-dependency/qoshish/Cargo.lock b/...e-with-external-dependency/add/Cargo.lock → ...th-external-dependency/qoshish/Cargo.lock
diff --git a/...ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/qoshish/Cargo.toml b/...ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/qoshish/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "qoshuvchi",
+    "bitta_qoshish",
+]
diff --git a/...xternal-dependency/add/add_one/Cargo.toml → ...pendency/qoshish/bitta_qoshish/Cargo.toml b/...xternal-dependency/add/add_one/Cargo.toml → ...pendency/qoshish/bitta_qoshish/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "add_one"
+name = "bitta_qoshish"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/...t-cargo/no-listing-03-workspace-with-external-dependency/qoshish/bitta_qoshish/src/lib.rs b/...t-cargo/no-listing-03-workspace-with-external-dependency/qoshish/bitta_qoshish/src/lib.rs
@@ -0,0 +1,5 @@
+use rand;
+
+pub fn bitta_qoshish(x: i32) -> i32 {
+    x + 1
+}
diff --git a/...about-cargo/no-listing-03-workspace-with-external-dependency/qoshish/qoshuvchi/Cargo.toml b/...about-cargo/no-listing-03-workspace-with-external-dependency/qoshish/qoshuvchi/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "qoshuvchi"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+
+bitta_qoshish = { path = "../bitta_qoshish" }
diff --git a/...external-dependency/add/adder/src/main.rs → ...-dependency/qoshish/qoshuvchi/src/main.rs b/...external-dependency/add/adder/src/main.rs → ...-dependency/qoshish/qoshuvchi/src/main.rs
diff --git a/rustbook-uz/src/ch14-03-cargo-workspaces.md b/rustbook-uz/src/ch14-03-cargo-workspaces.md
@@ -18,7 +18,7 @@ Buning o'rniga, u binary(ikkilik) crate yordamida paketga yo'lni ko'rsatib, work
 <span class="filename">Fayl nomi: Cargo.toml</span>
 
 ```toml
-{{#include ../listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml}}
+{{#include ../listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/qoshish/Cargo.toml}}
 ```
 
 Keyin, *qoshuvchi* jilida `cargo new` ni ishga tushirish orqali `qoshuvchi` binary cratesini yaratamiz:
@@ -56,7 +56,7 @@ Keyinchalik, workspaceda boshqa a'zolar(member) paketini yaratamiz va uni `bitta
 <span class="filename">Fayl nomi: Cargo.toml</span>
 
 ```toml
-{{#include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml}}
+{{#include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/Cargo.toml}}
 ```
 
 Keyin `bitta_qoshish` nomli yangi kutubxonalibrary cratesini yarating:
@@ -94,15 +94,15 @@ Sizning *qoshish* jildingizda endi quyidagi jild va fayllar bo‘lishi kerak:
 <span class="filename">Fayl nomi: bitta_qoshish/src/lib.rs</span>
 
 ```rust,noplayground
-{{#rustdoc_include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add_one/src/lib.rs}}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/bitta_qoshish/src/lib.rs}}
 ```
 
 Endi biz kutubxonamizga ega bo'lgan `bitta_qoshish` paketiga bog'liq bo'lgan `qoshuvchi` paketiga ega bo'lishimiz mumkin. Birinchidan, biz *qoshuvchi/Cargo.toml* ga `bitta_qoshish` yo'liga bog'liqlikni qo'shishimiz kerak.
 
 <span class="filename">Fayl nomi: qoshuvchi/Cargo.toml</span>
 
 ```toml
-{{#include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml:6:7}}
+{{#include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/qoshish/qoshuvchi/Cargo.toml:6:7}}
 ```
 
 Cargo workspacedagi cratelar bir-biriga bog'liq bo'ladi deb o'ylamaydi, shuning uchun biz qaramlik munosabatlari(relationship) haqida aniq bo'lishimiz kerak.
@@ -112,7 +112,7 @@ Keyin, keling, `qoshuvchi` cratedagi `bitta_qoshish` funksiyasidan (`bitta_qoshi
 <span class="filename">Fayl nomi: qoshuvchi/src/main.rs</span>
 
 ```rust,ignore
-{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs}}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-07/qoshish/qoshuvchi/src/main.rs}}
 ```
 
 <span class="caption">Roʻyxat 14-7: `bitta_qoshish` kutubxonasi cratesidan `qoshish` cratesidan foydalanish</span>
@@ -127,14 +127,12 @@ copy output below; the output updating script doesn't handle subdirectories in p
 
 ```console
 $ cargo build
-   Compiling add_one v0.1.0 (file:///projects/qoshish/bitta_qoshish)
+   Compiling bitta_qoshish v0.1.0 (file:///projects/qoshish/bitta_qoshish)
    Compiling qoshuvchi v0.1.0 (file:///projects/qoshish/qoshuvchi)
     Finished dev [unoptimized + debuginfo] target(s) in 0.68s
 ```
 
-To run the binary crate from the *add* directory, we can specify which
-package in the workspace we want to run by using the `-p` argument and the
-package name with `cargo run`:
+Binary crateni *qoshish* jildidan ishga tushirish uchun biz `-p` argumenti va `cargo run` bilan paket nomidan foydalanib workspaceda qaysi paketni ishga tushirishni belgilashimiz mumkin:
 
 <!-- manual-regeneration
 cd listings/ch14-more-about-cargo/listing-14-07/add
@@ -143,13 +141,13 @@ copy output below; the output updating script doesn't handle subdirectories in p
 -->
 
 ```console
-$ cargo run -p adder
+$ cargo run -p qoshuvchi
     Finished dev [unoptimized + debuginfo] target(s) in 0.0s
-     Running `target/debug/adder`
+     Running `target/debug/qoshuvchi`
 Hello, world! 10 plus one is 11!
 ```
 
-This runs the code in *adder/src/main.rs*, which depends on the `add_one` crate.
+Bu kodni *qoshuvchi/src/main.rs* da ishga tushiradi, bu `bitta_qoshish` cratesiga bog'liq.
 
 #### Depending on an External Package in a Workspace