Use a hardcoded constant instead of calling OpenProcessToken. by smmalis37 · Pull Request #119032 · rust-lang/rust

smmalis37 · 2023-12-17T00:30:21Z

Now that Win 7 support is dropped, we can resurrect #90144.

GetCurrentProcessToken is defined in processthreadsapi.h as:

FORCEINLINE
HANDLE
GetCurrentProcessToken (
VOID
)
{
return (HANDLE)(LONG_PTR) -4;
}

Since it's very unlikely that this constant will ever change, let's just use it instead of making calls to get the same information.

rustbot · 2023-12-17T00:30:30Z

r? @thomcc

(rustbot has picked a reviewer for you, use r? to override)

deltragon · 2023-12-17T10:16:32Z

Additionally, windows 7 was re-added as a tier 3 target in #118150, so it might be good to test with that/keep the old code under a cfg for that target.

smmalis37 · 2023-12-17T17:03:47Z

Hmm, doesn't seem to like my cfg for win7 support. What should it be?

ChrisDenton · 2023-12-18T06:48:05Z

The target is probably too new to be in the bootstrap compiler (which is currently beta 2013-11-13). The bootstrap compiler will next be updated in a week or two. In the meantime, you can put something like this at the top of the file:

#![cfg_attr(bootstrap, allow(unexpected_cfgs))]

This will tell the bootstrap (stage0) compiler to ignore the error while not affecting the newly built (stage1+) compiler.

ChrisDenton · 2023-12-19T08:53:30Z

Ok, this looks good. Could you squish your commits in to one?

Urgau · 2024-01-03T13:34:06Z

The target is probably too new to be in the bootstrap compiler (which is currently beta 2013-11-13). The bootstrap compiler will next be updated in a week or two. In the meantime, you can put something like this at the top of the file:
#![cfg_attr(bootstrap, allow(unexpected_cfgs))]

Note that the better and recommended way is to add the exception to the "extra check-cfg list" in bootstrap:

rust/src/bootstrap/src/lib.rs

Lines 91 to 93 in e51e98d

(Some(Mode::Std),"target_env",Some(&["libnx"])),
// (Some(Mode::Std), "target_os", Some(&[])),
(Some(Mode::Std),"target_arch",Some(&["spirv","nvptx","xtensa"])),

bors · 2024-01-13T16:58:06Z

☔ The latest upstream changes (presumably #117285) made this pull request unmergeable. Please resolve the merge conflicts.

ChrisDenton · 2024-02-09T11:45:37Z

Hi, very sorry for the delay here. This was right around when i was going on holiday and evidently I missed that I hadn't approved it.

Could you rebase on master? The file has moved to library/std/src/sys/pal/windows/os.rs. Also the cfg_attr(bootstrap... line is no longer needed.

smmalis37 · 2024-02-10T22:22:16Z

Yeah, I should be able to get back to this next weekend.

Now that Win 7 support is dropped, we can resurrect rust-lang#90144. GetCurrentProcessToken is defined in processthreadsapi.h as: FORCEINLINE HANDLE GetCurrentProcessToken ( VOID ) { return (HANDLE)(LONG_PTR) -4; } Since it's very unlikely that this constant will ever change, let's just use it instead of making calls to get the same information.

smmalis37 · 2024-02-16T23:57:39Z

Rebase came out clean, think this is ready.

ChrisDenton · 2024-02-17T00:24:41Z

Thanks for sticking with this and sorry again for the delay.

@bors r+ rollup

bors · 2024-02-17T00:24:45Z

📌 Commit 3b63ede has been approved by ChrisDenton

It is now in the queue for this repository.

Use a hardcoded constant instead of calling OpenProcessToken. Now that Win 7 support is dropped, we can resurrect rust-lang#90144. GetCurrentProcessToken is defined in processthreadsapi.h as: FORCEINLINE HANDLE GetCurrentProcessToken ( VOID ) { return (HANDLE)(LONG_PTR) -4; } Since it's very unlikely that this constant will ever change, let's just use it instead of making calls to get the same information.

Rollup of 8 pull requests Successful merges: - rust-lang#119032 (Use a hardcoded constant instead of calling OpenProcessToken.) - rust-lang#120932 (const_mut_refs: allow mutable pointers to statics) - rust-lang#121059 (Add and use a simple extension trait derive macro in the compiler) - rust-lang#121135 (coverage: Discard spans that fill the entire function body) - rust-lang#121187 (Add examples to document the return type of quickselect functions) - rust-lang#121191 (Add myself to review rotation (and a rustbot ping)) - rust-lang#121192 (Give some intrinsics fallback bodies) - rust-lang#121197 (Ensure `./configure` works when `configure.py` path contains spaces) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119032 - smmalis37:patch-1, r=ChrisDenton Use a hardcoded constant instead of calling OpenProcessToken. Now that Win 7 support is dropped, we can resurrect rust-lang#90144. GetCurrentProcessToken is defined in processthreadsapi.h as: FORCEINLINE HANDLE GetCurrentProcessToken ( VOID ) { return (HANDLE)(LONG_PTR) -4; } Since it's very unlikely that this constant will ever change, let's just use it instead of making calls to get the same information.

rustbot assigned thomcc Dec 17, 2023

rustbot added O-windows Operating system: Windows 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 Dec 17, 2023

This comment has been minimized.
Sign in to view

deltragon suggested changes Dec 17, 2023
View reviewed changes

Comment threadlibrary/std/src/sys/windows/os.rs Outdated

This comment has been minimized.
Sign in to view

ChrisDenton assigned ChrisDenton and unassigned thomcc Dec 18, 2023

ChrisDenton reviewed Dec 18, 2023
View reviewed changes

Comment threadlibrary/std/src/sys/windows/os.rs Outdated

This comment has been minimized.
Sign in to view

smmalis37 force-pushed the patch-1 branch from 5b31f9b to 68174bcCompare December 19, 2023 16:53

smmalis37 added 2 commits February 16, 2024 23:52

Remove cfg_attr
3b63ede

smmalis37 force-pushed the patch-1 branch from 68174bc to 3b63edeCompare February 16, 2024 23:56

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 Feb 17, 2024

This was referenced Feb 17, 2024
Rollup of 7 pull requests #121222
Closed
Rollup of 8 pull requests #121227
Merged

bors merged commit 5f21609 into rust-lang:masterFeb 17, 2024

rustbot added this to the 1.78.0 milestone Feb 17, 2024

smmalis37 deleted the patch-1 branch February 18, 2024 00:34

Uh oh!

Uh oh!

Conversation

smmalis37 commented Dec 17, 2023

Uh oh!

rustbot commented Dec 17, 2023

Uh oh!

This comment has been minimized.

Uh oh!

deltragon commented Dec 17, 2023

Uh oh!

This comment has been minimized.

This comment has been minimized.

smmalis37 commented Dec 17, 2023

Uh oh!

ChrisDenton commented Dec 18, 2023

Uh oh!

Uh oh!

This comment has been minimized.

ChrisDenton commented Dec 19, 2023

Uh oh!

Urgau commented Jan 3, 2024

Uh oh!

bors commented Jan 13, 2024

Uh oh!

ChrisDenton commented Feb 9, 2024

Uh oh!

smmalis37 commented Feb 10, 2024

Uh oh!

smmalis37 commented Feb 16, 2024

Uh oh!

ChrisDenton commented Feb 17, 2024

Uh oh!

bors commented Feb 17, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants