Use a hardcoded constant instead of calling OpenProcessToken.

[smmalis37]

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]

r? @thomcc

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

[deltragon]

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]

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

[ChrisDenton]

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]

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

[Urgau]

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]

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

[ChrisDenton]

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]

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

[smmalis37]

Rebase came out clean, think this is ready.

[ChrisDenton]

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

@bors r+ rollup

[bors]

📌 Commit 3b63ede has been approved by ChrisDenton

It is now in the queue for this repository.