From 8cb82ce5aa081def5fbb03c2c61cf3d0c35c529c Mon Sep 17 00:00:00 2001 From: ismoilovdevml Date: Fri, 24 Nov 2023 06:47:29 +0500 Subject: [PATCH] update code --- .../listing-14-04/Cargo.toml | 2 +- .../listing-14-04/src/lib.rs | 38 ++++++++-------- .../listing-14-04/src/main.rs | 10 ++--- .../listing-14-05/Cargo.toml | 2 +- .../listing-14-05/src/lib.rs | 44 +++++++++---------- rustbook-uz/src/ch14-00-more-about-cargo.md | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml index 66ef4b53..c2e2c607 100644 --- a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml +++ b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "art" +name = "rassom" version = "0.1.0" edition = "2021" diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs index b077a9a7..da9d5774 100644 --- a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs +++ b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs @@ -1,29 +1,29 @@ -//! # Art +//! # Rassom //! -//! A library for modeling artistic concepts. +//! Badiiy tushunchalarni modellashtirish uchun kutubxona. -pub mod kinds { - /// The primary colors according to the RYB color model. - pub enum PrimaryColor { - Red, - Yellow, - Blue, +pub mod turlar { + /// RYB rang modeliga muvofiq asosiy ranglar. + pub enum AsosiyRang { + Qizil, + Sariq, + Kok, } - /// The secondary colors according to the RYB color model. - pub enum SecondaryColor { - Orange, - Green, - Purple, + /// RYB rang modeliga muvofiq ikkinchi darajali ranglar. + pub enum IkkilamchiRang { + Qovoqrang, + Yashil, + Siyohrang, } } -pub mod utils { - use crate::kinds::*; +pub mod yordamchi { + use crate::turlar::*; - /// Combines two primary colors in equal amounts to create - /// a secondary color. - pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor { - SecondaryColor::Orange + /// Ikkilamchi rang yaratish uchun ikkita asosiy rangni teng + /// miqdorda birlashtiradi. + pub fn aralashtirish(c1: AsosiyRang, c2: AsosiyRang) -> IkkilamchiRang { + IkkilamchiRang::Qovoqrang } } diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/main.rs b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/main.rs index b1a4bf79..8df6540a 100644 --- a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/main.rs +++ b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-04/src/main.rs @@ -1,8 +1,8 @@ -use art::kinds::PrimaryColor; -use art::utils::mix; +use art::turlar::AsosiyRang; +use rassom::yordamchi::aralashtirish; fn main() { - let red = PrimaryColor::Red; - let yellow = PrimaryColor::Yellow; - mix(red, yellow); + let qizil = AsosiyRang::Qizil; + let yellow = AsosiyRang::Sariq; + aralashtirish(qizil, sariq); } diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml index 66ef4b53..c2e2c607 100644 --- a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml +++ b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "art" +name = "rassom" version = "0.1.0" edition = "2021" diff --git a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs index c5aa9e7b..d23150d5 100644 --- a/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs +++ b/rustbook-uz/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs @@ -1,40 +1,40 @@ // ANCHOR: here -//! # Art +//! # Rassom //! -//! A library for modeling artistic concepts. +//! Badiiy tushunchalarni modellashtirish uchun kutubxona. -pub use self::kinds::PrimaryColor; -pub use self::kinds::SecondaryColor; -pub use self::utils::mix; +pub use self::turlar::AsosiyRang; +pub use self::turlar::IkkilamchiRang; +pub use self::yordamchi::aralashtirish; -pub mod kinds { +pub mod turlar { // --snip-- // ANCHOR_END: here - /// The primary colors according to the RYB color model. - pub enum PrimaryColor { - Red, - Yellow, - Blue, + /// RYB rang modeliga muvofiq asosiy ranglar. + pub enum AsosiyRang { + Qizil, + Sariq, + Kok, } - /// The secondary colors according to the RYB color model. - pub enum SecondaryColor { - Orange, - Green, - Purple, + /// RYB rang modeliga muvofiq ikkinchi darajali ranglar. + pub enum IkkilamchiRang { + Qovoqrang, + Yashil, + Siyohrang, } // ANCHOR: here } -pub mod utils { +pub mod yordamchi { // --snip-- // ANCHOR_END: here - use crate::kinds::*; + use crate::turlar::*; - /// Combines two primary colors in equal amounts to create - /// a secondary color. - pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor { - SecondaryColor::Orange + /// Ikkilamchi rang yaratish uchun ikkita asosiy rangni teng + /// miqdorda birlashtiradi. + pub fn aralashtirish(c1: AsosiyRang, c2: AsosiyRang) -> IkkilamchiRang { + IkkilamchiRang::Qovoqrang } // ANCHOR: here } diff --git a/rustbook-uz/src/ch14-00-more-about-cargo.md b/rustbook-uz/src/ch14-00-more-about-cargo.md index ebe4165a..4a54af0a 100644 --- a/rustbook-uz/src/ch14-00-more-about-cargo.md +++ b/rustbook-uz/src/ch14-00-more-about-cargo.md @@ -8,4 +8,4 @@ Hozirgacha biz kodimizni yaratish(build), ishga tushirish(run) va sinab ko'rish( * [crates.io](https://crates.io/) dan binary(ikkilik) fayllarni o'rnating * Maxsus buyruqlar yordamida cargoni kengaytiring -Caergo biz ushbu bobda ko'rib chiqiladigan funksiyalardan ham ko'proq narsani qila oladi, shuning uchun uning barcha xususiyatlarini to'liq tushuntirish uchun uning [texnik hujjatlariga](https://doc.rust-lang.org/cargo/) qarang. +Cargo biz ushbu bobda ko'rib chiqiladigan funksiyalardan ham ko'proq narsani qila oladi, shuning uchun uning barcha xususiyatlarini to'liq tushuntirish uchun uning [texnik hujjatlariga](https://doc.rust-lang.org/cargo/) qarang.