-
Notifications
You must be signed in to change notification settings - Fork 549
robot-name: Redesign for testability #2114
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ | |
| "pminten", | ||
| "razielgn", | ||
| "rofrol", | ||
| "senekor", | ||
| "spazm", | ||
| "stringparser", | ||
| "workingjubilee", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,64 @@ | ||
| use std::{ | ||
| collections::HashSet, | ||
| sync::{LazyLock, Mutex}, | ||
| sync::{Arc, Mutex}, | ||
| }; | ||
|
|
||
| use rand::{Rng, thread_rng}; | ||
| use rand::Rng; | ||
|
|
||
| static NAMES: LazyLock<Mutex<HashSet<String>>> = LazyLock::new(|| Mutex::new(HashSet::new())); | ||
|
|
||
| pub struct Robot { | ||
| name: String, | ||
| } | ||
|
|
||
| fn generate_name() -> String { | ||
| fn generate_name<R: Rng>(rng: &mut R, used_names: &mut HashSet<String>) -> String { | ||
| loop { | ||
| let mut s = String::with_capacity(5); | ||
| static LETTERS: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ"; | ||
| static NUMBERS: &[u8] = b"0123456789"; | ||
| for _ in 0..2 { | ||
| s.push(*thread_rng().choose(LETTERS).unwrap() as char); | ||
| s.push(rng.random_range('A'..='Z')); | ||
| } | ||
| for _ in 0..3 { | ||
| s.push(*thread_rng().choose(NUMBERS).unwrap() as char); | ||
| s.push(rng.random_range('0'..='9')); | ||
| } | ||
|
|
||
| if NAMES.lock().unwrap().insert(s.clone()) { | ||
| if used_names.insert(s.clone()) { | ||
| return s; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Robot { | ||
| pub fn new() -> Robot { | ||
| Robot { | ||
| name: generate_name(), | ||
| /// A `RobotFactory` is responsible for ensuring that all robots produced by | ||
| /// it have a unique name. Robots from different factories can have the same | ||
| /// name. | ||
| pub struct RobotFactory { | ||
| used_names: Arc<Mutex<HashSet<String>>>, | ||
| } | ||
|
|
||
| pub struct Robot { | ||
| used_names: Arc<Mutex<HashSet<String>>>, | ||
| name: String, | ||
| } | ||
|
|
||
| impl RobotFactory { | ||
| pub fn new() -> Self { | ||
| Self { | ||
| used_names: Arc::new(Mutex::new(HashSet::new())), | ||
| } | ||
| } | ||
|
|
||
| pub fn name(&self) -> &str { | ||
| &self.name[..] | ||
| pub fn new_robot<R: Rng>(&mut self, rng: &mut R) -> Robot { | ||
| let mut guard = self.used_names.lock().unwrap(); | ||
| Robot { | ||
| used_names: Arc::clone(&self.used_names), | ||
| name: generate_name(rng, &mut guard), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn reset_name(&mut self) { | ||
| self.name = generate_name(); | ||
| impl Robot { | ||
| pub fn name(&self) -> &str { | ||
| &self.name | ||
| } | ||
| } | ||
|
|
||
| impl Default for Robot { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| // When a robot is reset, its factory must still ensure that there are no | ||
| // name conflicts with other robots from the same factory. | ||
| pub fn reset<R: Rng>(&mut self, rng: &mut R) { | ||
| let mut used_names = self.used_names.lock().unwrap(); | ||
| let new_name = generate_name(rng, &mut used_names); | ||
| used_names.remove(&self.name); | ||
| self.name = new_name | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,28 @@ | ||
| use rand::Rng; | ||
|
|
||
| /// A `RobotFactory` is responsible for ensuring that all robots produced by | ||
| /// it have a unique name. Robots from different factories can have the same | ||
| /// name. | ||
| pub struct RobotFactory; | ||
|
|
||
| pub struct Robot; | ||
|
|
||
| impl Robot { | ||
| impl RobotFactory { | ||
| pub fn new() -> Self { | ||
| todo!("Construct a new Robot struct."); | ||
| todo!("Create a new robot factory") | ||
| } | ||
|
|
||
| pub fn new_robot<R: Rng>(&mut self, _rng: &mut R) -> Robot { | ||
| todo!("Create a new robot with a unique name") | ||
| } | ||
| } | ||
|
|
||
| impl Robot { | ||
| pub fn name(&self) -> &str { | ||
| todo!("Return the reference to the robot's name."); | ||
| todo!("Return a reference to the robot's name"); | ||
| } | ||
|
|
||
| pub fn reset_name(&mut self) { | ||
| todo!("Assign a new unique name to the robot."); | ||
| pub fn reset<R: Rng>(&mut self, _rng: &mut R) { | ||
| todo!("Assign a new unique name to the robot"); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.