Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-16 04:55:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
163,895 Commits 10 Branches 157 Tags
cfa58dfd1c78ec170a1b13ae1d31ce99310bdce8
Commit Graph

163895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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:
![2022-03-03 11-21-43_backstick](https://user-images.githubusercontent.com/2827553/156546536-569b7692-7ac4-4388-8e93-c1628ddc6a0f.png)

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::thread::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
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
Nicholas Nethercote 643ba50004 Introduce MatcherPosRepetition. 
There are three `Option` fields in `MatcherPos` that are only used in
tandem. This commit combines them, making the code slightly easier to
read. (It also makes clear that the `sep` field arguably should have
been `Option<Option<Token>>`!)
 2022-03-03 21:45:52 +11:00
Nicholas Nethercote b9fabc3f9c Add a static size assertion for MatcherPos. 2022-03-03 21:45:45 +11:00
Nicholas Nethercote 11c565f14b Improve if/else formatting in macro_parser.rs. 
To avoid the strange style where comments force `else` onto its own
line.

The commit also removes several else-after-return constructs, which can
be hard to read.
 2022-03-03 21:45:42 +11:00
Guillaume Gomez e3f04de3d4 Add test for higher kinded functions generated by macros 2022-03-03 11:32:07 +01:00
Axel Viala 37c1eb0a47 Doc: Fix use of quote instead of backstick in Adapter::map. 2022-03-03 11:25:01 +01:00
bors 06460fe72c Auto merge of #94548 - matthiaskrgr:rollup-spa38z8, r=matthiaskrgr 
Rollup of 8 pull requests

Successful merges:

 - #93562 (Update the documentation for `{As,Into,From}Raw{Fd,Handle,Socket}`.)
 - #94101 (rustdoc: add test cases for hidden enum variants)
 - #94484 (8 - Make more use of `let_chains`)
 - #94522 (Remove out-of-context line at end of E0284 message)
 - #94534 (Re-export (unstable) core::ffi types from std::ffi)
 - #94536 (Move transmute_undefined_repr back to nursery again)
 - #94537 (Use ? operator in one instance instead of manual match)
 - #94544 (Add some examples to comments in mbe code)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
 2022-03-03 10:14:04 +00:00
Matthias Krüger 88aa75ba8e Rollup merge of #94544 - mark-i-m:macro-comments, r=petrochenkov 
Add some examples to comments in mbe code

I found these things non-obvious when re-familiarizing myself with the code.

r? `@petrochenkov`
 2022-03-03 11:02:56 +01:00
Matthias Krüger 98c9ee8917 Rollup merge of #94537 - est31:master, r=notriddle 
Use ? operator in one instance instead of manual match

As suggested [here](https://github.com/rust-lang/rust/pull/94139#discussion_r818102403).

r? `@notriddle`
 2022-03-03 11:02:55 +01:00
Matthias Krüger 250e7e1efe Rollup merge of #94536 - dtolnay:transmute, r=Manishearth 
Move transmute_undefined_repr back to nursery again

This PR reapplies #94014, which was reverted unintentionally I think by #94329. The combination of https://github.com/rust-lang/rust-clippy/pull/8432 + https://github.com/rust-lang/rust-clippy/pull/8497 in clippy should prevent this from happening again.

r? `@Manishearth`
 2022-03-03 11:02:54 +01:00
Matthias Krüger 6f1730c9e3 Rollup merge of #94534 - bstrie:cffistd, r=Mark-Simulacrum 
Re-export (unstable) core::ffi types from std::ffi
 2022-03-03 11:02:53 +01:00
Matthias Krüger 845516cd3b Rollup merge of #94522 - thinety:fix-e0284-message, r=Dylan-DPC 
Remove out-of-context line at end of E0284 message

Removed the last line of E0284 message because it was out of context (probably kept by accident when changing whole error message).
 2022-03-03 11:02:52 +01:00
Matthias Krüger dbf0372b72 Rollup merge of #94484 - c410-f3r:more-let-chains, r=jackh726 
8 - Make more use of `let_chains`

Continuation of #94376.

cc #53667
 2022-03-03 11:02:51 +01:00
Matthias Krüger 850511d483 Rollup merge of #94101 - notriddle:notriddle/strip-test-cases, r=GuillaumeGomez 
rustdoc: add test cases for hidden enum variants
 2022-03-03 11:02:50 +01:00
Matthias Krüger afd6f5c478 Rollup merge of #93562 - sunfishcode:sunfishcode/io-docs, r=joshtriplett 
Update the documentation for `{As,Into,From}Raw{Fd,Handle,Socket}`.

This change weakens the descriptions of the
`{as,into,from}_raw_{fd,handle,socket}` descriptions from saying that
they *do* express ownership relations to say that they are *typically used*
in ways that express ownership relations. This is needed since, for
example, std's own [`RawFd`] implements `{As,From,Into}Fd` without any of
the ownership relationships.

This adds proper `# Safety` comments to `from_raw_{fd,handle,socket}`,
adds the requirement that raw handles be not opened with the
`FILE_FLAG_OVERLAPPED` flag, and merges the `OwnedHandle::from_raw_handle`
comment into the main `FromRawHandle::from_raw_handle` comment.

And, this changes `HandleOrNull` and `HandleOrInvalid` to not implement
`FromRawHandle`, since they are intended for limited use in FFI situations,
and not for generic use, and they have constraints that are stronger than
the those of `FromRawHandle`.

[`RawFd`]: https://doc.rust-lang.org/stable/std/os/unix/io/type.RawFd.html
 2022-03-03 11:02:49 +01:00
bors 2f8d1a835b Auto merge of #94541 - Dylan-DPC:rollup-564wbq3, r=Dylan-DPC 
Rollup of 9 pull requests

Successful merges:

 - #92061 (update char signess for openbsd)
 - #93072 (Compatible variants suggestion with desugaring)
 - #93354 (Add documentation about `BorrowedFd::to_owned`.)
 - #93663 (Rename `BorrowedFd::borrow_raw_fd` to `BorrowedFd::borrow_raw`.)
 - #94375 (Adt copy suggestions)
 - #94433 (Improve allowness of the unexpected_cfgs lint)
 - #94499 (Documentation was missed when demoting Windows XP to no_std only)
 - #94505 (Restore the local filter on mono item sorting)
 - #94529 (Unused doc comments blocks)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
 2022-03-03 04:28:08 +00:00
mark 88b99224c1 add some examples to comments in mbe code 2022-03-02 21:33:43 -06:00
Dan Gohman 8253cfef7a Remove the comment about FILE_FLAG_OVERLAPPED. 
There may eventually be something to say about `FILE_FLAG_OVERLAPPED` here,
however this appears to be independent of the other changes in this PR,
so remove them from this PR so that it can be discussed separately.
 2022-03-02 16:25:31 -08:00
Ralf Jung 24fc1151ee bless clippy 2022-03-02 19:20:27 -05:00
Dylan DPC 878a4ff90e Rollup merge of #94529 - GuillaumeGomez:unused-doc-comments-blocks, r=estebank 
Unused doc comments blocks

Fixes #77030.
 2022-03-03 01:09:15 +01:00
Dylan DPC 3e6abf0c35 Rollup merge of #94505 - cuviper:mono-item-sort-local, r=michaelwoerister,davidtwco 
Restore the local filter on mono item sorting

In `CodegenUnit::items_in_deterministic_order`, there's a comment that
only local HirIds should be taken into account, but #90408 removed the
`as_local` call that sets others to None. Restoring that check fixes the
s390x hangs seen in [RHBZ 2058803].

[RHBZ 2058803]: https://bugzilla.redhat.com/show_bug.cgi?id=2058803
 2022-03-03 01:09:14 +01:00
Dylan DPC 293fa7a32b Rollup merge of #94499 - RandomInsano:patch-1, r=Dylan-DPC 
Documentation was missed when demoting Windows XP to no_std only

After a quick discussion on #81250 which removed special casing for mutexes added [here](https://github.com/rust-lang/rust/commit/10b103af48368c5df644fa61dc417a36083922c8) to support Windows XP, we can't say that the standard library can build for it.

This change modifies the tier 3 non-ARM targets to show the standard library will no longer build for these and there is no work being done to change that.
 2022-03-03 01:09:13 +01:00
Dylan DPC 493ed7a6af Rollup merge of #94433 - Urgau:check-cfg-allowness, r=petrochenkov 
Improve allowness of the unexpected_cfgs lint

This pull-request improve the allowness (`#[allow(...)]`) of the `unexpected_cfgs` lint.

Before this PR only crate level `#![allow(unexpected_cfgs)]` worked, now with this PR it also work when put around `cfg!` or if it is in a upper level. Making it work ~for the attributes `cfg`, `cfg_attr`, ...~ for the same level is awkward as the current code is design to give "Some parent node that is close to this macro call" (cf. https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/base/struct.ExpansionData.html) meaning that allow on the same line as an attribute won't work. I'm note even sure if this would be possible.

Found while working on https://github.com/rust-lang/rust/pull/94298.
r? ````````@petrochenkov````````
 2022-03-03 01:09:12 +01:00
Dylan DPC 7537b2036a Rollup merge of #94375 - WaffleLapkin:copy-suggestion, r=estebank 
Adt copy suggestions

Previously we've only suggested adding `Copy` bounds when the type being moved/copied is a type parameter (generic). With this PR we also suggest adding bounds when a type
- Can be copy
- All predicates that need to be satisfied for that are based on type params

i.e. we will suggest `T: Copy` for `Option<T>`, but won't suggest anything for `Option<String>`.

An example:
```rust
fn duplicate<T>(t: Option<T>) -> (Option<T>, Option<T>) {
    (t, t)
}
```
New error (current compiler doesn't provide `help`:):
```text
error[E0382]: use of moved value: `t`
 --> t.rs:2:9
  |
1 | fn duplicate<T>(t: Option<T>) -> (Option<T>, Option<T>) {
  |                 - move occurs because `t` has type `Option<T>`, which does not implement the `Copy` trait
2 |     (t, t)
  |      -  ^ value used here after move
  |      |
  |      value moved here
  |
help: consider restricting type parameter `T`
  |
1 | fn duplicate<T: Copy>(t: Option<T>) -> (Option<T>, Option<T>) {
  |               ++++++
```

Fixes #93623
r? ``````````@estebank``````````
``````````@rustbot`````````` label +A-diagnostics +A-suggestion-diagnostics +C-enhancement

----

I'm not at all sure if this is the right implementation for this kind of suggestion, but it seems to work :')
 2022-03-03 01:09:11 +01:00
Dylan DPC c9dc44be24 Rollup merge of #93663 - sunfishcode:sunfishcode/as-raw-name, r=joshtriplett 
Rename `BorrowedFd::borrow_raw_fd` to `BorrowedFd::borrow_raw`.

Also, rename `BorrowedHandle::borrow_raw_handle` and
`BorrowedSocket::borrow_raw_socket` to `BorrowedHandle::borrow_raw` and
`BorrowedSocket::borrow_raw`.

This is just a minor rename to reduce redundancy in the user code calling
these functions, and to eliminate an inessential difference between
`BorrowedFd` code and `BorrowedHandle`/`BorrowedSocket` code.

While here, add a simple test exercising `BorrowedFd::borrow_raw_fd`.

r? ``````@joshtriplett``````
 2022-03-03 01:09:10 +01:00
Dylan DPC bc1a8905d6 Rollup merge of #93354 - sunfishcode:sunfishcode/document-borrowedfd-toowned, r=joshtriplett 
Add documentation about `BorrowedFd::to_owned`.

Following up on #88564, this adds documentation explaining why
`BorrowedFd::to_owned` returns another `BorrowedFd` rather than an
`OwnedFd`. And similar for `BorrowedHandle` and `BorrowedSocket`.

r? `````@joshtriplett`````
 2022-03-03 01:09:09 +01:00
Dylan DPC bdad4a7be7 Rollup merge of #93072 - m-ou-se:compatible-variants-suggestion-with-desugaring, r=estebank 
Compatible variants suggestion with desugaring

This fixes #90553 for `for` loops and other desugarings.

r? ```@estebank```
 2022-03-03 01:09:08 +01:00
Dylan DPC a83021bda9 Rollup merge of #92061 - semarie:openbsd-archs, r=joshtriplett 
update char signess for openbsd

it adds more archs support for openbsd: arm, mips64, powerpc, powerpc64, and riscv64.
 2022-03-03 01:09:07 +01:00
The 8472 e18abbf2ac update available_parallelism docs since cgroups and sched_getaffinity are now taken into account 2022-03-03 00:43:46 +01:00
The 8472 af6d2ed245 hardcode /sys/fs/cgroup instead of doing a lookup via mountinfo 
this avoids parsing mountinfo which can be huge on some systems and
something might be emulating cgroup fs for sandboxing reasons which means
it wouldn't show up as mountpoint

additionally the new implementation operates on a single pathbuffer, reducing allocations
 2022-03-03 00:43:46 +01:00
The 8472 bac5523ea0 Use cgroup quotas for calculating available_parallelism 
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::thread::available_parallelism()); // prints Ok(3)
}
```


Caveats

* cgroup v1 is ignored
* funky mountpoints (containing spaces, newlines or control chars) for cgroupfs will not be handled correctly since that would require unescaping /proc/self/mountinfo
  The escaping behavior of procfs seems to be undocumented. systemd and docker default to `/sys/fs/cgroup` so it should be fine for most systems.
* quota will be ignored when `sched_getaffinity` doesn't work
* assumes procfs is mounted under `/proc` and cgroupfs mounted and readable somewhere in the directory tree
 2022-03-03 00:43:45 +01:00
est31 fe78bd4920 Use ? operator in one instance instead of manual match 2022-03-02 22:10:35 +01:00
flip1995 76f0305f83 Move transmute_undefined_repr back to nursery 
There's still open discussion if this lint is ready to be enabled by
default. We want to give us more time to figure this out and prevent
this lint from getting to stable as an enabled-by-default lint.
 2022-03-02 13:07:00 -08:00
Dan Gohman af642bb466 Fix a broken doc link on Windows. 2022-03-02 12:39:36 -08:00
bors 8769f4ef2f Auto merge of #92214 - ehuss:submodule-bg-exit, r=Mark-Simulacrum 
Error if submodule fetch fails.

In CI, if fetching a submodule fails, the script would exit successfully. Later parts of the build will fail due to the missing files, but it is a bit confusing, and I think it would be better to error out earlier.

The reason is that in bash, `wait` without arguments will exit 0 even if a background job exits with an error. The solution here is to wait on each individual job, which will return the exit code of the job.

This was encountered in #92177.
 2022-03-02 19:50:55 +00:00
Guillaume Gomez 6f0eb2a4e1 Update stdarch submodule 2022-03-02 20:06:46 +01:00