Skip to content

Fix documentation of Instant::now on mac #147503

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 12, 2025
Merged

Fix documentation of Instant::now on mac #147503

merged 1 commit into from
Oct 12, 2025
+6 −6

Conversation

stepancheg
Copy link
Contributor

It is CLOCK_UPTIME_RAW on Apple.

rust/library/std/src/sys/pal/unix/time.rs

Lines 260 to 264 in b6f0945

impl Instant {
#[cfg(target_vendor = "apple")]
pub(crate) const CLOCK_ID: libc::clockid_t = libc::CLOCK_UPTIME_RAW;
#[cfg(not(target_vendor = "apple"))]
pub(crate) const CLOCK_ID: libc::clockid_t = libc::CLOCK_MONOTONIC;

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Oct 9, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 9, 2025

r? @joboet

rustbot has assigned @joboet.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

joboet
joboet reviewed Oct 10, 2025
View reviewed changes
@rustbot
Copy link
Collaborator

rustbot commented Oct 10, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@stepancheg stepancheg requested a review from joboet October 10, 2025 19:02
@joboet
Copy link
Member

joboet commented Oct 11, 2025

Thanks!
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 11, 2025

📌 Commit dff4561 has been approved by joboet

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Oct 11, 2025

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 11, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Oct 12, 2025
@Zalathar
Rollup merge of rust-lang#147503 - stepancheg:instant-now-mac-doc, r=…
67b6951 
…joboet

Fix documentation of Instant::now on mac

It is `CLOCK_UPTIME_RAW` on Apple.

https://github.com/rust-lang/rust/blob/b6f0945e4681bc4d2faa7c22c5f61dc36abf7dd2/library/std/src/sys/pal/unix/time.rs#L260-L264
@Zalathar Zalathar mentioned this pull request Oct 12, 2025
Closed
bors added a commit that referenced this pull request Oct 12, 2025
@bors
Auto merge of #147598 - Zalathar:rollup-87wjjvk, r=Zalathar
a6d9321 
Rollup of 12 pull requests

Successful merges:

 - #138799 (core: simplify `Extend` for tuples)
 - #146692 (Save x.py's help text for saving output time)
 - #147168 (Don't unconditionally build alloc for `no-std` targets)
 - #147178 ([DebugInfo] Improve formatting of MSVC enum struct variants)
 - #147240 (Add an ACP list item to the library tracking issue template)
 - #147246 (Explain not existed key in BTreeMap::split_off)
 - #147393 (Extract most code from `define_feedable!`)
 - #147495 (Update wasm-component-ld to 0.5.18)
 - #147503 (Fix documentation of Instant::now on mac)
 - #147541 (Change int-to-ptr transmute lowering back to inttoptr)
 - #147549 (Replace `LLVMRustContextCreate` with normal LLVM-C API calls)
 - #147596 (Adjust the Arm targets in CI to reflect latest changes)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 12, 2025
Merged
bors added a commit that referenced this pull request Oct 12, 2025
@bors
Auto merge of #147603 - matthiaskrgr:rollup-j6uae13, r=matthiaskrgr
8927649 
Rollup of 8 pull requests

Successful merges:

 - #138799 (core: simplify `Extend` for tuples)
 - #145897 (Rehome 30 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [#4 of Batch #2])
 - #146692 (Save x.py's help text for saving output time)
 - #147240 (Add an ACP list item to the library tracking issue template)
 - #147246 (Explain not existed key in BTreeMap::split_off)
 - #147393 (Extract most code from `define_feedable!`)
 - #147503 (Fix documentation of Instant::now on mac)
 - #147549 (Replace `LLVMRustContextCreate` with normal LLVM-C API calls)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f5a6b1b into rust-lang:master Oct 12, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 12, 2025
rust-timer added a commit that referenced this pull request Oct 12, 2025
@rust-timer
Unrolled build for #147503
5318852 
Rollup merge of #147503 - stepancheg:instant-now-mac-doc, r=joboet

Fix documentation of Instant::now on mac

It is `CLOCK_UPTIME_RAW` on Apple.

https://github.com/rust-lang/rust/blob/b6f0945e4681bc4d2faa7c22c5f61dc36abf7dd2/library/std/src/sys/pal/unix/time.rs#L260-L264
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joboet joboet Awaiting requested review from joboet

Assignees

@joboet joboet

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.92.0

Development

Successfully merging this pull request may close these issues.

4 participants

@stepancheg @rustbot @joboet @bors