Skip to content
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

sleep_ms -> sleep #29622

Merged
merged 1 commit into from
Nov 7, 2015
Merged

sleep_ms -> sleep #29622

merged 1 commit into from
Nov 7, 2015

Conversation

steveklabnik
Copy link
Member

Now that thread::sleep is a real thing, let's use it

Fixes #29621

r? @bstrie

@bstrie
Copy link
Contributor

bstrie commented Nov 5, 2015

@bors: r+

@bors
Copy link
Collaborator

bors commented Nov 5, 2015

📌 Commit 500e8db has been approved by bstrie

@@ -131,7 +132,7 @@ fn main() {
});
}

thread::sleep_ms(50);
thread::sleep(Duration::from_millis(50);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs another close paren.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

figures, with the ignore I didn't see it :/

@apasel422
Copy link
Contributor

@bors: r- pending a fix to @aravind-pg's comment.

@@ -614,8 +617,8 @@ We have three new lines. We’ve added an argument, `table`. We access the
the fork at that particular index. That gives us access to the `Mutex` at that
index, and we call `lock()` on it. If the mutex is currently being accessed by
someone else, we’ll block until it becomes available. We have also a call to
`thread::sleep_ms` between the moment first fork is picked and the moment the
second forked is picked, as the process of picking up the fork is not
`thread::sleep` between the moment first fork is picked and the moment the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/moment first/moment the first/

@steveklabnik
Copy link
Member Author

@bors: r=bstrie rollup

@bors
Copy link
Collaborator

bors commented Nov 6, 2015

📌 Commit 801f83f has been approved by bstrie

Now that thread::sleep is a real thing, let's use it

Fixes rust-lang#29621
Manishearth added a commit to Manishearth/rust that referenced this pull request Nov 7, 2015
Now that thread::sleep is a real thing, let's use it

Fixes rust-lang#29621

r? @bstrie
bors added a commit that referenced this pull request Nov 7, 2015
@bors bors merged commit 801f83f into rust-lang:master Nov 7, 2015
@steveklabnik steveklabnik deleted the gh29621 branch June 19, 2016 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants