diff options
| author | bors <bors@rust-lang.org> | 2025-05-16 05:45:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-16 05:45:37 +0000 |
| commit | c79bbfab78dcb0a72aa3b2bc35c00334b58bfe2e (patch) | |
| tree | d6f39db82b528e67936230e39ad6c460d8904977 /src/ci/cpu-usage-over-time.py | |
| parent | 7e19eef048ba58c28c70afbf5f95da4829c15796 (diff) | |
| parent | 5ce27f572ff4a5ba50146dc70aa5397b24a3f20a (diff) | |
| download | rust-c79bbfab78dcb0a72aa3b2bc35c00334b58bfe2e.tar.gz rust-c79bbfab78dcb0a72aa3b2bc35c00334b58bfe2e.zip | |
Auto merge of #141066 - matthiaskrgr:rollup-e7tyrj5, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #140791 (std: explain prefer `TryInto` over `TryFrom` when specifying traits bounds on generic function) - #140834 (move (or remove) some impl Trait tests) - #140910 (Remove `stable` attribute from wasi fs (read_exact|write_all)_at) - #140984 (fix doc for UnixStream) - #140997 (Add negative test coverage for `-Clink-self-contained` and `-Zlinker-features`) - #141003 (Improve ternary operator recovery) - #141009 (Migrate to modern datetime API) - #141013 (Implement methods to set STARTUPINFO flags for Command API on Windows) - #141026 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/cpu-usage-over-time.py')
| -rwxr-xr-x | src/ci/cpu-usage-over-time.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/cpu-usage-over-time.py b/src/ci/cpu-usage-over-time.py index 3d9dc86734f..19a39f34953 100755 --- a/src/ci/cpu-usage-over-time.py +++ b/src/ci/cpu-usage-over-time.py @@ -170,7 +170,7 @@ print("Time,Idle") while True: time.sleep(1) next_state = State() - now = datetime.datetime.utcnow().isoformat() + now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).isoformat() idle = next_state.idle_since(cur_state) print("%s,%s" % (now, idle)) sys.stdout.flush() |