Rollup of 4 pull requests #117608

matthiaskrgr · 2023-11-05T11:41:49Z

Successful merges:

Don't pass -stdlib=libc++ when building C files on macOS #116017 (Don't pass -stdlib=libc++ when building C files on macOS)
bootstrap/setup: create hooks directory if non-existing #117524 (bootstrap/setup: create hooks directory if non-existing)
Remove unused LoadResult::DecodeIncrCache variant #117588 (Remove unused LoadResult::DecodeIncrCache variant)
Add diagnostic items for a few of core's builtin macros #117596 (Add diagnostic items for a few of core's builtin macros)

r? @ghost
@rustbot modify labels: rollup

When using *Command Line Tools for Xcode* version 15.0, clang will warn about `argument unused during compilation: '-stdlib=libc++'` if this flag is present when compiling C files only (i.e. no C++ files). To avoid this warning, we can add the flag only to CXXFLAGS and not to CFLAGS.

…rsan68 Don't pass `-stdlib=libc++` when building C files on macOS When using *Command Line Tools for Xcode* version 15.0, clang will warn about `argument unused during compilation: '-stdlib=libc++'` if this flag is present when compiling C files only (i.e. no C++ files). To avoid this warning, we can add the flag only to CXXFLAGS and not to CFLAGS. --- [Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/clang.20warning.3A.20argument.20unused.20during.20compilation.20.28libc.2B.2B.29)

…ir, r=Mark-Simulacrum bootstrap/setup: create hooks directory if non-existing When running `./x setup` on a local repository I chose to install a `pre-push` git hook, but this happened: ```shell Would you like to install the git hook?: [y/N] y error: could not create hook .git/hooks/pre-push: do you already have the git hook installed? No such file or directory (os error 2) thread 'main' panicked at src/core/build_steps/setup.rs:462:9: install_git_hook_maybe(&config) failed with No such file or directory (os error 2) ``` This was caused because the `.git/hooks` directory did not exist in my local repository. Creating it manually and re-running the command works fine. This PR tests for the above directory and if it does not exist then it _tries_ to create it before hard linking the pre-push hook - we use `fs::create_dir()` and disregard the result (ie. it could fail if the directory was created in the meantime) and proceed to call `fs::hard_link()` all the same.

…, r=cjgillot Remove unused LoadResult::DecodeIncrCache variant

…lstrieb Add diagnostic items for a few of core's builtin macros Specifically, `env`, `option_env`, and `include`. There are a number of reasons why people might want to look at these in lints (For example, to ensure that things behave consistently, detect things that might make builds less reproducible, etc). Concretely, in PL/Rust (well, `plrustc`) we have lints that forbid these (which I'd like to [add to clippy as restriction lints](https://rust-lang.zulipchat.com/#narrow/stream/257328-clippy/topic/Landing.20a.20flotilla.20of.20lints.3F) eventually), and `dylint` also has [lints that look for `env!`/`option_env!`](https://github.com/trailofbits/dylint/blob/109a07e9f27a9651ef33b6677ccaddd21466e97a/examples/general/env_cargo_path/src/lib.rs) (although perhaps not `include`), which would benefit from this. My experience is that it's pretty annoying to (robustly) check uses of builtin macros without these IME, although that's perhaps just my own fault (e.g. I could be doing it wrong). At `@Nilstrieb's` suggestion, I've added a comment that explains why these are here, even though they are not used in the compiler. This is mostly to discourage removal, although it's not a big deal if it happens (I'm certainly not suggesting the presence of these be in any way stable). --- In theory this is a library PR (in that it's in library/core), but I'm going to roll compiler because the existence of this or not is much more likely something they care about rather than libs. Hopefully nobody objects to this. r? compiler

matthiaskrgr · 2023-11-05T11:42:03Z

@bors r+ rollup=never p=4

bors · 2023-11-05T11:42:06Z

📌 Commit a660516 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-11-05T11:47:41Z

⌛ Testing commit a660516 with merge 04817ff...

bors · 2023-11-05T13:42:42Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 04817ff to master...

rust-timer · 2023-11-05T13:43:51Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116017	Don't pass `-stdlib=libc++` when building C files on macOS	`47562b96f95767836362373969013370476a5645` (link)
#117524	bootstrap/setup: create hooks directory if non-existing	`1b127c9ebd247ae7ad2204ad8c22967f5278f01c` (link)
#117588	Remove unused LoadResult::DecodeIncrCache variant	`6bc395ba490321a7e2fb45a3ff7cd2ba026fe160` (link)
#117596	Add diagnostic items for a few of core's builtin macros	`7c5b137100128bdf8d8dae63b0e61127dd5e2b34` (link)

previous master: 513a48517e

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-11-06T06:44:23Z

Finished benchmarking commit (04817ff): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.6%	[-0.8%, -0.4%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.6%	[-0.8%, -0.4%]	3

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.6%, 0.8%]	5
Regressions ❌ (secondary)	0.6%	[0.6%, 0.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[0.6%, 0.8%]	5

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 637.364s -> 638.392s (0.16%)
Artifact size: 304.54 MiB -> 304.54 MiB (0.00%)

Zalathar and others added 8 commits October 17, 2023 23:18

bootstrap/setup: create hooks directory if non-existing

274a6f3

Remove unused LoadResult::DecodeIncrCache variant

a3b964b

Add diagnostic items for a few of core's builtin macros

65bec86

Rollup merge of rust-lang#117588 - bjorn3:remove_unused_error_variant…

629ee74

…, r=cjgillot Remove unused LoadResult::DecodeIncrCache variant

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 Nov 5, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 5, 2023

bors merged commit 04817ff into rust-lang:master Nov 5, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Nov 5, 2023

github-actions bot mentioned this pull request Nov 6, 2023

Automated pull from upstream master ferrocene/ferrocene#84

Merged

matthiaskrgr deleted the rollup-g9fagmv branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #117608

Rollup of 4 pull requests #117608

matthiaskrgr commented Nov 5, 2023

matthiaskrgr commented Nov 5, 2023

bors commented Nov 5, 2023

bors commented Nov 5, 2023

bors commented Nov 5, 2023

rust-timer commented Nov 5, 2023

rust-timer commented Nov 6, 2023

Rollup of 4 pull requests #117608

Rollup of 4 pull requests #117608

Conversation

matthiaskrgr commented Nov 5, 2023

matthiaskrgr commented Nov 5, 2023

bors commented Nov 5, 2023

bors commented Nov 5, 2023

bors commented Nov 5, 2023

rust-timer commented Nov 5, 2023

rust-timer commented Nov 6, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size