163955 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bors	047f9c4bc4	Auto merge of #94539 - tmiasko:string-attributes, r=nikic ... Pass LLVM string attributes as string slices	2022-03-04 10:38:11 +00:00
bors	62ff2bcf94	Auto merge of #94159 - erikdesjardins:align-load, r=nikic ... Add !align metadata on loads of &/&mut/Box Note that this refers to the alignment of what the loaded value points to, _not_ the alignment of the loaded value itself. r? `@ghost` (blocked on #94158)	2022-03-04 08:14:31 +00:00
bors	65f6d33b77	Auto merge of #94096 - cjgillot:ensure-stability, r=lcnr ... Ensure stability directives are checked in all cases Split off #93017 Stability and deprecation were not checked in all cases, for instance if a type error happened. This PR moves the check earlier in the pipeline to ensure the errors are emitted in all cases. r? `@lcnr`	2022-03-04 05:49:14 +00:00
bors	8fa5d74a7c	Auto merge of #94588 - Dylan-DPC:rollup-7pxd0i3, r=Dylan-DPC ... Rollup of 10 pull requests Successful merges: - #88805 (Clarification of default socket flags) - #93418 (rustdoc & doc: no `shortcut` for `rel="icon"`) - #93913 (Remove the everybody loops pass) - #93965 (Make regular stdio lock() return 'static handles) - #94339 (ARM: Only allow using d16-d31 with asm! when supported by the target) - #94404 (Make Ord and PartialOrd opt-out in `newtype_index`) - #94466 (bootstrap: correct reading of flags for llvm) - #94572 (Use `HandleOrNull` and `HandleOrInvalid` in the Windows FFI bindings.) - #94575 (CTFE SwitchInt: update comment) - #94582 (Fix a bug in `x.py fmt` that prevents some files being formatted.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup	2022-03-04 02:53:40 +00:00
Dylan DPC	733a1a8ca4	Rollup merge of #94582 - nnethercote:fix-x-fmt-bug, r=Mark-Simulacrum ... Fix a bug in `x.py fmt` that prevents some files being formatted. If you have a file in the repository root with the same name as a file somewhere within a directory, the latter currently won't get formatted. I have experienced this multiple times and not understood what was happening; I finally figured out the problem today. This commit fixes the problem. r? ```@Mark-Simulacrum```	2022-03-04 02:06:44 +01:00
Dylan DPC	72c0c08445	Rollup merge of #94575 - RalfJung:switchint-comment, r=oli-obk ... CTFE SwitchInt: update comment I just wondered why this doesn't use `binary_op`. r? ```@oli-obk```	2022-03-04 02:06:43 +01:00
Dylan DPC	308efafc77	Rollup merge of #94572 - sunfishcode:sunfishcode/handle-or, r=joshtriplett ... Use `HandleOrNull` and `HandleOrInvalid` in the Windows FFI bindings. Use the new `HandleOrNull` and `HandleOrInvalid` types that were introduced as part of [I/O safety] in a few functions in the Windows FFI bindings. This factors out an `unsafe` block and two `unsafe` function calls in the Windows implementation code. And, it helps test `HandleOrNull` and `HandleOrInvalid`, and indeed, it turned up a bug: `OwnedHandle` also needs to be `#[repr(transparent)]`, as it's used inside of `HandleOrNull` and `HandleOrInvalid` which are also `#[repr(transparent)]`. r? ```@joshtriplett``` [I/O safety]: https://github.com/rust-lang/rust/issues/87074	2022-03-04 02:06:42 +01:00
Dylan DPC	958bd0268c	Rollup merge of #94466 - jonhoo:bootstrap-proper-env-flags, r=Mark-Simulacrum ... bootstrap: correct reading of flags for llvm First, this reverts the `CFLAGS`/`CXXFLAGS` of #93918. Those flags are already read by `cc` and populated into `Build` earlier on in the process. We shouldn't be overriding that based on `CFLAGS`, since `cc` also respects overrides like `CFLAGS_{TARGET}` and `HOST_CFLAGS`, which we want to take into account. Second, this adds the same capability to specify target-specific versions of `LDFLAGS` as we have through `cc` for the `C*` flags: https://github.com/alexcrichton/cc-rs#external-configuration-via-environment-variables	2022-03-04 02:06:41 +01:00
Dylan DPC	aede21f42f	Rollup merge of #94404 - pierwill:newtype-index-noord-2, r=Aaron1011 ... Make Ord and PartialOrd opt-out in `newtype_index` Part of work on #90317. This will allow us to do ```diff rustc_index::newtype_index! { /// A unique ID associated with a macro invocation and expansion. pub struct LocalExpnId { ENCODABLE = custom DEBUG_FORMAT = "expn{}" + ORD_IMPL = off } } ```	2022-03-04 02:06:41 +01:00
Dylan DPC	79c71d1f9e	Rollup merge of #94339 - Amanieu:arm-d32, r=nagisa ... ARM: Only allow using d16-d31 with asm! when supported by the target Support can be determined by checking for the "d32" LLVM feature. r? ```````````````@nagisa```````````````	2022-03-04 02:06:40 +01:00
Dylan DPC	cdfb39ef07	Rollup merge of #93965 - Mark-Simulacrum:owned-stdio, r=dtolnay ... Make regular stdio lock() return 'static handles This also deletes the unstable API surface area previously added to expose this functionality on new methods rather than built into the current set. Closes #86845 (tracking issue for unstable API needed without this) r? ``````@dtolnay`````` to kick off T-libs-api FCP	2022-03-04 02:06:39 +01:00
Dylan DPC	c1585a17a3	Rollup merge of #93913 - bjorn3:remove_everybody_loops, r=jackh726 ... Remove the everybody loops pass It isn't used anymore by rustdoc. Split out of https://github.com/rust-lang/rust/pull/92895. There has been some previous discussion there.	2022-03-04 02:06:38 +01:00
Dylan DPC	c695de05f2	Rollup merge of #93418 - ojeda:no-shortcut, r=camelid ... rustdoc & doc: no `shortcut` for `rel="icon"` According to https://html.spec.whatwg.org/multipage/links.html#rel-icon: > For historical reasons, the `icon` keyword may be preceded by the keyword "`shortcut`". And to https://developer.mozilla.org/en-US/docs/Web/HTML/Link_types: > **Warning:** The `shortcut` link type is often seen before `icon`, but this link type is non-conforming, ignored and **web authors must not use it anymore.** While it was removed from the Rust logo case a while ago in commit 085679c ("Use theme-adaptive SVG favicon from other Rust sites"), it is still there for the custom logo case. Also updated a few other instances. Signed-off-by: Miguel Ojeda <ojeda@kernel.org>	2022-03-04 02:06:38 +01:00
Dylan DPC	4c70200476	Rollup merge of #88805 - krhancoc:master, r=dtolnay ... Clarification of default socket flags This PR outlines the decision to disable inheritance of socket objects when possible to child processes in the documentation.	2022-03-04 02:06:37 +01:00
bors	6d7684101a	Auto merge of #94009 - compiler-errors:gat-rustdoc, r=GuillaumeGomez ... Support GATs in Rustdoc Implements: 1. Rendering GATs in trait definitions and impl blocks 2. Rendering GATs in types (e.g. in the return type of a function) Fixes #92341 This is my first rustdoc PR, so I have absolutely no idea how to produce tests for this. Advice from the rustdoc team would be wonderful! I tested locally and things looked correct: 	2022-03-04 00:27:23 +00:00
Nicholas Nethercote	fc142ebaf8	Fix a bug in x.py fmt that prevents some files being formatted. ... If you have a file in the repository root with the same name as a file somewhere within a directory, the latter currently won't get formatted. I have experienced this multiple times and not understood what was happening; I finally figured out the problem today. This commit fixes the problem.	2022-03-04 09:30:12 +11:00
bors	40d3040ae1	Auto merge of #94571 - matthiaskrgr:rollup-4ul5ydb, r=matthiaskrgr ... Rollup of 8 pull requests Successful merges: - #92697 (Use cgroup quotas for calculating `available_parallelism`) - #94057 (improve comments for `simplify_type`) - #94547 (`parse_tt` cleanups) - #94550 (rustdoc: Add test for higher kinded functions generated by macros) - #94551 (Doc: Fix use of quote instead of backstick in Adapter::map.) - #94554 (Fix invalid lint_node_id being put on a removed stmt) - #94555 (all: fix some typos) - #94563 (Remove a unnecessary `..` pattern) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup	2022-03-03 21:40:28 +00:00
Michael Goulet	0e57a16c88	add tests	2022-03-03 13:01:35 -08:00
Michael Goulet	9f21514426	don't forget generics for GATs in impls	2022-03-03 13:01:35 -08:00
Michael Goulet	aefc0a223a	make generic projection types print correctly	2022-03-03 13:01:35 -08:00
Ralf Jung	0854781861	CTFE SwitchInt: update comment	2022-03-03 14:46:29 -05:00
Dan Gohman	35606490ab	Use HandleOrNull and HandleOrInvalid in the Windows FFI bindings. ... Use the new `HandleOrNull` and `HandleOrInvalid` types that were introduced as part of [I/O safety] in a few functions in the Windows FFI bindings. This factors out an `unsafe` block and two `unsafe` function calls in the Windows implementation code. And, it helps test `HandleOrNull` and `HandleOrInvalid`, which indeed turned up a bug: `OwnedHandle` also needs to be `#[repr(transparent)]`, as it's used inside of `HandleOrNull` and `HandleOrInvalid` which are also `#[repr(transparent)]`. [I/O safety]: https://github.com/rust-lang/rust/issues/87074	2022-03-03 11:20:49 -08:00
Matthias Krüger	cfa58dfd1c	Rollup merge of #94563 - TaKO8Ki:remove-unnecessary-patten-for-ignoring-remaining-parts, r=Dylan-DPC ... Remove a unnecessary `..` pattern	2022-03-03 20:01:49 +01:00
Matthias Krüger	939c1585a4	Rollup merge of #94555 - cuishuang:master, r=oli-obk ... all: fix some typos Signed-off-by: cuishuang <imcusg@gmail.com>	2022-03-03 20:01:48 +01:00
Matthias Krüger	26cbf9158d	Rollup merge of #94554 - Urgau:stmt-node-id-ice, r=petrochenkov ... Fix invalid lint_node_id being put on a removed stmt This pull-request remove a invalid `assign_id!` being put on an stmt node. The problem is that this node is being removed away by a cfg making it unreachable when triggering a buffered lint. The comment in the other match arm already tell to not assign a id because it could have a `#[cfg()]` so this is just respecting the comment. Fixes https://github.com/rust-lang/rust/issues/94523 r? ```````@petrochenkov```````	2022-03-03 20:01:48 +01:00
Matthias Krüger	40c146cebd	Rollup merge of #94551 - darnuria:doc-map-backstick, r=dtolnay ... Doc: Fix use of quote instead of backstick in Adapter::map. A little commit to fix documentation rendering and semantics in https://doc.rust-lang.org/std/iter/struct.Map.html#notes-about-side-effects `"` where used around an expression instead \`. Screenshot on doc.rust-lang.org:  Looking forward: Maybe reworking the doc to use assert_eq like the upper paragraph: ``` let v: Vec<i32> = vec![1, 2, 3].into_iter().map(|x| x + 1).rev().collect(); assert_eq!(v, [4, 3, 2]); ```	2022-03-03 20:01:47 +01:00
Matthias Krüger	835eaaa77e	Rollup merge of #94550 - GuillaumeGomez:HKF-macros, r=notriddle ... rustdoc: Add test for higher kinded functions generated by macros Fixes #75564. The problem has been solved apparently so adding a test to prevent a regression. r? ```@notriddle```	2022-03-03 20:01:46 +01:00
Matthias Krüger	16c6594f34	Rollup merge of #94547 - nnethercote:parse_tt-cleanups, r=petrochenkov ... `parse_tt` cleanups I've been looking closely at this code, and saw some opportunities to improve its readability. r? ```````@petrochenkov```````	2022-03-03 20:01:45 +01:00
Matthias Krüger	fec7a79088	Rollup merge of #94057 - lcnr:simplify_type-uwu, r=nikomatsakis ... improve comments for `simplify_type` Should now correctly describe what's going on. Experimented with checking the invariant for projections but that ended up requiring fairly involved changes. I assume that it is not possible to get unsoundness here, at least for now and I can pretty much guarantee that it's impossible to trigger it by accident. r? `````@nikomatsakis````` cc #92721	2022-03-03 20:01:44 +01:00
Matthias Krüger	a638f50d8d	Rollup merge of #92697 - the8472:cgroups, r=joshtriplett ... Use cgroup quotas for calculating `available_parallelism` Automated tests for this are possible but would require a bunch of assumptions. It requires root + a recent kernel, systemd and maybe docker. And even then it would need a helper binary since the test has to run in a separate process. Limitations * only supports cgroup v2 and assumes it's mounted under `/sys/fs/cgroup` * procfs must be available * the quota gets mixed into `sched_getaffinity`, so if the latter doesn't work then quota information gets ignored too Manually tested via ``` // spawn a new cgroup scope for the current user $ sudo systemd-run -p CPUQuota="300%" --uid=$(id -u) -tdS // quota.rs #![feature(available_parallelism)] fn main() { println!("{:?}", std:🧵:available_parallelism()); // prints Ok(3) } ``` strace: ``` sched_getaffinity(3041643, 32, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47]) = 32 openat(AT_FDCWD, "/proc/self/cgroup", O_RDONLY|O_CLOEXEC) = 3 statx(0, NULL, AT_STATX_SYNC_AS_STAT, STATX_ALL, NULL) = -1 EFAULT (Bad address) statx(3, "", AT_STATX_SYNC_AS_STAT|AT_EMPTY_PATH, STATX_ALL, {stx_mask=STATX_BASIC_STATS|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFREG|0444, stx_size=0, ...}) = 0 lseek(3, 0, SEEK_CUR) = 0 read(3, "0::/system.slice/run-u31477.serv"..., 128) = 36 read(3, "", 92) = 0 close(3) = 0 statx(AT_FDCWD, "/sys/fs/cgroup/system.slice/run-u31477.service/cgroup.controllers", AT_STATX_SYNC_AS_STAT, STATX_ALL, {stx_mask=STATX_BASIC_STATS|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFREG|0444, stx_size=0, ...}) = 0 openat(AT_FDCWD, "/sys/fs/cgroup/system.slice/run-u31477.service/cpu.max", O_RDONLY|O_CLOEXEC) = 3 statx(3, "", AT_STATX_SYNC_AS_STAT|AT_EMPTY_PATH, STATX_ALL, {stx_mask=STATX_BASIC_STATS|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFREG|0644, stx_size=0, ...}) = 0 lseek(3, 0, SEEK_CUR) = 0 read(3, "300000 100000\n", 20) = 14 read(3, "", 6) = 0 close(3) = 0 openat(AT_FDCWD, "/sys/fs/cgroup/system.slice/cpu.max", O_RDONLY|O_CLOEXEC) = 3 statx(3, "", AT_STATX_SYNC_AS_STAT|AT_EMPTY_PATH, STATX_ALL, {stx_mask=STATX_BASIC_STATS|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFREG|0644, stx_size=0, ...}) = 0 lseek(3, 0, SEEK_CUR) = 0 read(3, "max 100000\n", 20) = 11 read(3, "", 9) = 0 close(3) = 0 openat(AT_FDCWD, "/sys/fs/cgroup/cpu.max", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) sched_getaffinity(0, 128, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47]) = 40 ``` r? ```````@joshtriplett``````` cc ```````@yoshuawuyts``````` Tracking issue and previous discussion: #74479	2022-03-03 20:01:43 +01:00
Camille GILLOT	c680d39b1e	Bless nll tests.	2022-03-03 19:59:52 +01:00
bors	10913c0001	Auto merge of #87835 - xFrednet:rfc-2383-expect-attribute-with-ids, r=wesleywiser ... Implementation of the `expect` attribute (RFC 2383) This is an implementation of the `expect` attribute as described in [RFC-2383](https://rust-lang.github.io/rfcs/2383-lint-reasons.html). The attribute allows the suppression of lint message by expecting them. Unfulfilled lint expectations (meaning no expected lint was caught) will emit the `unfulfilled_lint_expectations` lint at the `expect` attribute. ### Example #### input ```rs // required feature flag #![feature(lint_reasons)] #[expect(unused_mut)] // Will warn about an unfulfilled expectation #[expect(unused_variables)] // Will be fulfilled by x fn main() { let x = 0; } ``` #### output ```txt warning: this lint expectation is unfulfilled --> $DIR/trigger_lint.rs:3:1 | LL | #[expect(unused_mut)] // Will warn about an unfulfilled expectation | ^^^^^^^^^^ | = note: `#[warn(unfulfilled_lint_expectations)]` on by default ``` ### Implementation This implementation introduces `Expect` as a new lint level for diagnostics, which have been expected. All lint expectations marked via the `expect` attribute are collected in the [`LintLevelsBuilder`] and assigned an ID that is stored in the new lint level. The `LintLevelsBuilder` stores all found expectations and the data needed to emit the `unfulfilled_lint_expectations` in the [`LintLevelsMap`] which is the result of the [`lint_levels()`] query. The [`rustc_errors::HandlerInner`] is the central error handler in rustc and handles the emission of all diagnostics. Lint message with the level `Expect` are suppressed during this emission, while the expectation ID is stored in a set which marks them as fulfilled. The last step is then so simply check if all expectations collected by the [`LintLevelsBuilder`] in the [`LintLevelsMap`] have been marked as fulfilled in the [`rustc_errors::HandlerInner`]. Otherwise, a new lint message will be emitted. The implementation of the `LintExpectationId` required some special handling to make it stable between sessions. Lints can be emitted during [`EarlyLintPass`]es. At this stage, it's not possible to create a stable identifier. The level instead stores an unstable identifier, which is later converted to a stable `LintExpectationId`. ### Followup TO-DOs All open TO-DOs have been marked with `FIXME` comments in the code. This is the combined list of them: * [ ] The current implementation doesn't cover cases where the `unfulfilled_lint_expectations` lint is actually expected by another `expect` attribute. * This should be easily possible, but I wanted to get some feedback before putting more work into this. * This could also be done in a new PR to not add to much more code to this one * [ ] Update unstable documentation to reflect this change. * [ ] Update unstable expectation ids in [`HandlerInner::stashed_diagnostics`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_errors/struct.HandlerInner.html#structfield.stashed_diagnostics) ### Open questions I also have a few open questions where I would like to get feedback on: 1. The RFC discussion included a suggestion to change the `expect` attribute to something else. (Initiated by `@Ixrec` [here](https://github.com/rust-lang/rfcs/pull/2383#issuecomment-378424091), suggestion from `@scottmcm` to use `#[should_lint(...)]` [here](https://github.com/rust-lang/rfcs/pull/2383#issuecomment-378648877)). No real conclusion was drawn on that point from my understanding. Is this still open for discussion, or was this discarded with the merge of the RFC? 2. How should the expect attribute deal with the new `force-warn` lint level? --- This approach was inspired by a discussion with `@LeSeulArtichaut.` RFC tracking issue: #54503 Mentoring/Implementation issue: #85549 [`LintLevelsBuilder`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/levels/struct.LintLevelsBuilder.html [`LintLevelsMap`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/lint/struct.LintLevelMap.html [`lint_levels()`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/context/struct.TyCtxt.html#method.lint_levels [`rustc_errors::HandlerInner`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_errors/struct.HandlerInner.html [`EarlyLintPass`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/trait.EarlyLintPass.html	2022-03-03 18:59:32 +00:00
pierwill	c08a9a4f1d	Make Ord, PartialOrd opt-out in newtype_index ... Also remove `step` impl if `ORD_IMPL = off`	2022-03-03 11:52:40 -06:00
Camille GILLOT	42ffdd973e	Make unknown feature error deterministic.	2022-03-03 18:50:28 +01:00
Camille GILLOT	27d8cd7db0	Cleanup feature gates.	2022-03-03 18:50:28 +01:00
Camille GILLOT	3c7947ee43	Gate stability attrs with other attributes.	2022-03-03 18:50:26 +01:00
Jon Gjengset	9c05f0b72c	bootstrap: correct reading of flags for llvm ... First, this reverts the `CFLAGS`/`CXXFLAGS` of #93918. Those flags are already read by `cc` and populated into `Build` earlier on in the process. We shouldn't be overriding that based on `CFLAGS`, since `cc` also respects overrides like `CFLAGS_{TARGET}` and `HOST_CFLAGS`, which we want to take into account. Second, this adds the same capability to specify target-specific versions of `LDFLAGS` as we have through `cc` for the `C*` flags: https://github.com/alexcrichton/cc-rs#external-configuration-via-environment-variables Note that this also necessitated an update to compiletest to treat CXXFLAGS separately from CFLAGS.	2022-03-03 09:42:23 -08:00
bjorn3	2f84484aac	Remove the everybody loops pass ... It isn't used anymore by rustdoc	2022-03-03 18:23:09 +01:00
Camille GILLOT	969f8735dc	Bless test.	2022-03-03 18:22:31 +01:00
Camille GILLOT	71838827b6	Force ensure stability_index.	2022-03-03 18:22:31 +01:00
Camille GILLOT	6f8e9f416a	Move query providers.	2022-03-03 18:22:31 +01:00
Camille GILLOT	1b4b5e066b	Remove useless map.	2022-03-03 18:14:34 +01:00
Camille GILLOT	fbcf7d415b	Move the set of features to the features query.	2022-03-03 18:08:30 +01:00
Takayuki Maeda	ff19c05832	remove a unnecessary .. pattern	2022-03-04 00:57:38 +09:00
bors	32cbc7630b	Auto merge of #84944 - lcnr:obligation-dedup, r=jackh726 ... remove obligation dedup from `impl_or_trait_obligations` Looking at the examples from #38528 they all seem to compile fine even without this and it seems like this might be unnecessary effort	2022-03-03 15:43:42 +00:00
bors	4566094913	Auto merge of #94512 - RalfJung:sdiv-ub, r=oli-obk ... Miri/CTFE: properly treat overflow in (signed) division/rem as UB To my surprise, it looks like LLVM treats overflow of signed div/rem as UB. From what I can tell, MIR `Div`/`Rem` directly lowers to the corresponding LLVM operation, so to make that correct we also have to consider these overflows UB in the CTFE/Miri interpreter engine. r? `@oli-obk`	2022-03-03 12:56:24 +00:00
cuishuang	00fffdddd2	all: fix some typos ... Signed-off-by: cuishuang <imcusg@gmail.com>	2022-03-03 19:47:23 +08:00
Loïc BRANSTETT	516488484e	Fix invalid lint_node_id being put on a removed stmt	2022-03-03 11:52:09 +01:00
Nicholas Nethercote	97eb1b4669	Change initial_matcher_pos() into MatcherPos::new().	2022-03-03 21:47:02 +11:00
Nicholas Nethercote	e5f3fd6250	Use a better return type for inner_parse_loop. ... Because `inner_parse_loop` has only one way to not succeed, not three.	2022-03-03 21:46:59 +11:00