dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
215,115 Commits 7 Branches 138 Tags 1.8 GiB
Commit Graph

215115 Commits

Author SHA1 Message Date
David Tolnay fa2ff4d7e5
Rebuild BinaryHeap on unwind from retain 2023-01-15 13:20:00 -08:00
David Tolnay 0d3eaa848c
Add test showing broken behavior of BinaryHeap::retain 2023-01-15 13:12:28 -08:00
bors ae4d89dfb5 Auto merge of #106742 - compiler-errors:new-solver-make-it-not-ice, r=lcnr 
Implement some FIXME methods in the new trait solver

Implement just enough of the solver's response logic to make it not ICE.

Also, fix a bug with `no_bound_vars` call failing due to canonical bound vars.

r? `@lcnr`
 2023-01-15 15:07:27 +00:00
bors fc11ee02ee Auto merge of #106171 - compiler-errors:consolidate-extract_callable_info, r=estebank,lcnr 
Consolidate two almost duplicated fn info extraction routines

Moves `extract_callable_info` up to trait selection, because it was being (almost) duplicated fully there for similar diagnostic purposes. This also generalizes the diagnostics we can give slightly (see UI test).
 2023-01-15 12:10:36 +00:00
bors bbb36fe545 Auto merge of #105851 - dtolnay:peekmutleak, r=Mark-Simulacrum 
Leak amplification for peek_mut() to ensure BinaryHeap's invariant is always met

In the libs-api team's discussion around #104210, some of the team had hesitations around exposing malformed BinaryHeaps of an element type whose Ord and Drop impls are trusted, and which does not contain interior mutability.

For example in the context of this kind of code:

```rust
use std::collections::BinaryHeap;
use std::ops::Range;
use std::slice;

fn main() {
    let slice = &mut ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
    let cut_points = BinaryHeap::from(vec![4, 2, 7]);
    println!("{:?}", chop(slice, cut_points));
}

// This is a souped up slice::split_at_mut to split in arbitrary many places.
//
// usize's Ord impl is trusted, so 1 single bounds check guarantees all those
// output slices are non-overlapping and in-bounds
fn chop<T>(slice: &mut [T], mut cut_points: BinaryHeap<usize>) -> Vec<&mut [T]> {
    let mut vec = Vec::with_capacity(cut_points.len() + 1);
    let max = match cut_points.pop() {
        Some(max) => max,
        None => {
            vec.push(slice);
            return vec;
        }
    };

    assert!(max <= slice.len());

    let len = slice.len();
    let ptr: *mut T = slice.as_mut_ptr();
    let get_unchecked_mut = unsafe {
        |range: Range<usize>| &mut *slice::from_raw_parts_mut(ptr.add(range.start), range.len())
    };

    vec.push(get_unchecked_mut(max..len));
    let mut end = max;
    while let Some(start) = cut_points.pop() {
        vec.push(get_unchecked_mut(start..end));
        end = start;
    }
    vec.push(get_unchecked_mut(0..end));
    vec
}
```

```console
[['7', '8', '9'], ['4', '5', '6'], ['2', '3'], ['0', '1']]
```

In the current BinaryHeap API, `peek_mut()` is the only thing that makes the above function unsound.

```rust
let slice = &mut ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
let mut cut_points = BinaryHeap::from(vec![4, 2, 7]);
{
    let mut max = cut_points.peek_mut().unwrap();
    *max = 0;
    std::mem::forget(max);
}
println!("{:?}", chop(slice, cut_points));
```

```console
[['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'], [], ['2', '3'], ['0', '1']]
```

Or worse:

```rust
let slice = &mut ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
let mut cut_points = BinaryHeap::from(vec![100, 100]);
{
    let mut max = cut_points.peek_mut().unwrap();
    *max = 0;
    std::mem::forget(max);
}
println!("{:?}", chop(slice, cut_points));
```

```console
[['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'], [], ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '\u{1}', '\0', '?', '翾', '?', '翾', '\0', '\0', '?', '翾', '?', '翾', '?', '啿', '?', '啿', '?', '啿', '?', '啿', '?', '啿', '?', '翾', '\0', '\0', '񤬐', '啿', '\u{5}', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\u{8}', '\0', '`@',` '\0', '\u{1}', '\0', '?', '翾', '?', '翾', '?', '翾', '
thread 'main' panicked at 'index out of bounds: the len is 33 but the index is 33', library/core/src/unicode/unicode_data.rs:319:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
```

---

This PR makes `peek_mut()` use leak amplification (https://doc.rust-lang.org/1.66.0/nomicon/leaking.html#drain) to preserve the heap's invariant even in the situation that `PeekMut` gets leaked.

I'll also follow up in the tracking issue of unstable `drain_sorted()` (#59278) and `retain()` (#71503).
 2023-01-15 08:59:55 +00:00
bors 754f6d4a8c Auto merge of #106892 - matthiaskrgr:rollup-ohneu8o, r=matthiaskrgr 
Rollup of 8 pull requests

Successful merges:

 - #106072 (fix: misleading "add dyn keyword before derive macro" suggestion)
 - #106859 (Suggestion for type mismatch when we need a u8 but the programmer wrote a char literal)
 - #106863 (Remove various double spaces in compiler source comments.)
 - #106865 (Add explanation comment for GUI test)
 - #106867 (Fix the stability attributes for `std::os::fd`.)
 - #106878 (Add regression test for #92157)
 - #106879 (Add regression test for #42114)
 - #106880 (doc: fix typo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
 2023-01-15 00:16:09 +00:00
Matthias Krüger cdf462275a
Rollup merge of #106880 - tspiteri:borrowing-sub-typo, r=cuviper 
doc: fix typo
 2023-01-15 01:01:39 +01:00
Matthias Krüger 30b963c05c
Rollup merge of #106879 - JohnTitor:issue-42114, r=compiler-errors 
Add regression test for #42114

Closes #42114
r? compiler-errors
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
 2023-01-15 01:01:39 +01:00
Matthias Krüger 08ef0ce056
Rollup merge of #106878 - JohnTitor:issue-92157, r=compiler-errors 
Add regression test for #92157

Closes #92157
r? compiler-errors
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
 2023-01-15 01:01:38 +01:00
Matthias Krüger 445e3841da
Rollup merge of #106867 - sunfishcode:sunfishcode/std-os-fd-stable-version, r=m-ou-se 
Fix the stability attributes for `std::os::fd`.

As `@bjorn3` pointed out [here], I used the wrong stability attribute in #98368 when making `std::os::fd` public. I set it to Rust 1.63, which was when io-safety was stabilized, but it should be Rust 1.66, which was when `std::os::fd` was stabilized.

[here]: https://github.com/rust-lang/rust/pull/98368#discussion_r1063721420
 2023-01-15 01:01:38 +01:00
Matthias Krüger 8843335451
Rollup merge of #106865 - GuillaumeGomez:add-gui-test-explanation, r=notriddle 
Add explanation comment for GUI test

r? `@notriddle`
 2023-01-15 01:01:37 +01:00
Matthias Krüger cc02ecc010
Rollup merge of #106863 - anden3:compiler-double-spaces, r=Nilstrieb 
Remove various double spaces in compiler source comments.

Was asked to do it by `@Nilstrieb`
 2023-01-15 01:01:37 +01:00
Matthias Krüger 980bf1979e
Rollup merge of #106859 - tialaramex:master, r=Nilstrieb 
Suggestion for type mismatch when we need a u8 but the programmer wrote a char literal

Today Rust just points out that we have a char and we need a u8, but if I wrote 'A' then I could fix this by just writing b'A' instead. This code should detect the case where we're about to report a type mismatch of this kind, and the programmer wrote a char literal, and the char they wrote is ASCII, so therefore just prefixing b to make a byte literal will do what they meant.

I have definitely written this mistake more than once, it's not difficult to figure out what to do, but the compiler might as well tell us anyway.

I provided a test with two simple examples where the suggestion is appropriate, and one where it is not because the char literal is not ASCII, showing that the suggestion is only triggered in the former cases.

I have contributed only a small typo doc fix before, so this is my first substantive rustc change.
 2023-01-15 01:01:36 +01:00
Matthias Krüger d7fcd01f67
Rollup merge of #106072 - eopb:dyn-derive, r=estebank 
fix: misleading "add dyn keyword before derive macro" suggestion

Fixes #106071
 2023-01-15 01:01:36 +01:00
David Tolnay 23501703fb
Document guarantees about BinaryHeap invariant 2023-01-14 13:28:30 -08:00
David Tolnay aedb756020
Leak amplification for peek_mut() to ensure BinaryHeap's invariant is always met 2023-01-14 13:28:22 -08:00
David Tolnay 4fe167f83a
Add test of leaking a binary_heap PeekMut 2023-01-14 13:28:14 -08:00
Nick Lamb 130d02b62e Improve E0308: suggest user meant to use byte literal, w/ tests and fix 
suggested by Nilstrieb

Co-authored-by: nils <48135649+Nilstrieb@users.noreply.github.com>
 2023-01-14 21:27:14 +00:00
Trevor Spiteri 208b781bda doc: fix typo 2023-01-14 22:09:14 +01:00
bors afaf3e07aa Auto merge of #106866 - matthiaskrgr:rollup-r063s44, r=matthiaskrgr 
Rollup of 8 pull requests

Successful merges:

 - #105526 (libcore: make result of iter::from_generator Clone)
 - #106563 (Fix `unused_braces` on generic const expr macro call)
 - #106661 (Stop probing for statx unless necessary)
 - #106820 (Deprioritize fulfillment errors that come from expansions.)
 - #106828 (rustdoc: remove `docblock` class from notable trait popover)
 - #106849 (Allocate one less vec while parsing arrays)
 - #106855 (rustdoc: few small cleanups)
 - #106860 (Remove various double spaces in the libraries.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
 2023-01-14 20:53:37 +00:00
Yuki Okushi cf5be0c3ac
Add regression test for #42114 
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
 2023-01-15 05:52:22 +09:00
Yuki Okushi aa51a0f19a
Add regression test for #92157 
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
 2023-01-15 05:47:24 +09:00
Dan Gohman 287c65838c Fix the stability attributes for `std::os::fd`. 
As @bjorn3 pointed out [here], I used the wrong stability attribute in #98368
when making `std::os::fd` public. I set it to Rust 1.63, which was when
io-safety was stabilized, but it should be Rust 1.66, which was when
`std::os::fd` was stabilized.

[here]: https://github.com/rust-lang/rust/pull/98368#discussion_r1063721420
 2023-01-14 09:47:34 -08:00
Matthias Krüger e0eb63a73c
Rollup merge of #106860 - anden3:doc-double-spaces, r=Dylan-DPC 
Remove various double spaces in the libraries.

I was just pretty bothered by this when reading the source for a function, and was suggested to check if this happened elsewhere.
 2023-01-14 18:45:29 +01:00
Matthias Krüger bc0c816410
Rollup merge of #106855 - klensy:rd-s, r=notriddle 
rustdoc: few small cleanups
 2023-01-14 18:45:28 +01:00
Matthias Krüger 9db8e6d5e9
Rollup merge of #106849 - WaffleLapkin:unvec, r=Nilstrieb 
Allocate one less vec while parsing arrays

Probably does not matter, but imo a little bit nicer.
 2023-01-14 18:45:28 +01:00
Matthias Krüger 14fbc21466
Rollup merge of #106828 - notriddle:notriddle/notable-trait-docblock, r=GuillaumeGomez 
rustdoc: remove `docblock` class from notable trait popover

This commit builds on b72de9be74, which removes the `docblock` class from the All Items page, and 9457380ac9, which removes the `docblock` class from the item decl.

Fixes #92974
 2023-01-14 18:45:27 +01:00
Matthias Krüger f04f97cea4
Rollup merge of #106820 - m-ou-se:macro-type-error-thing, r=estebank 
Deprioritize fulfillment errors that come from expansions.

Fixes (part of?) #69455
 2023-01-14 18:45:27 +01:00
Matthias Krüger 43134714f5
Rollup merge of #106661 - mjguzik:linux_statx, r=Mark-Simulacrum 
Stop probing for statx unless necessary

As is the current toy program:
fn main() -> std::io::Result<()> {
    use std::fs;

    let metadata = fs::metadata("foo.txt")?;

    assert!(!metadata.is_dir());
    Ok(())
}

... observed under strace will issue:
[snip]
statx(0, NULL, AT_STATX_SYNC_AS_STAT, STATX_ALL, NULL) = -1 EFAULT (Bad address) statx(AT_FDCWD, "foo.txt", AT_STATX_SYNC_AS_STAT, STATX_ALL, {stx_mask=STATX_ALL|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFREG|0644, stx_size=0, ...}) = 0

While statx is not necessarily always present, checking for it can be delayed to the first error condition. Said condition may very well never happen, in which case the check got avoided altogether.

Note this is still suboptimal as there still will be programs issuing it, but bulk of the problem is removed.

Tested by forbidding the syscall for the binary and observing it correctly falls back to newfstatat.

While here tidy up the commentary, in particular by denoting some problems with the current approach.
 2023-01-14 18:45:26 +01:00
Matthias Krüger d7bc758638
Rollup merge of #106563 - clubby789:gce-macro-braces, r=TaKO8Ki 
Fix `unused_braces` on generic const expr macro call

Fixes #106545

`@rustbot` label +A-const-generics +A-lint
 2023-01-14 18:45:26 +01:00
Matthias Krüger 085d2f1f09
Rollup merge of #105526 - Xiretza:iter-from-generator-derive, r=scottmcm 
libcore: make result of iter::from_generator Clone

`@rustbot` label +A-generators
 2023-01-14 18:45:25 +01:00
bors b8f9cb345a Auto merge of #106696 - kylematsuda:early-binder, r=lcnr 
Switch to `EarlyBinder` for `const_param_default` and `impl_trait_ref` queries

Part of the work to close #105779 and implement https://github.com/rust-lang/types-team/issues/78.

Several queries `X` have a `bound_X` variant that wraps the output in `EarlyBinder`. This PR adds `EarlyBinder` to the return type of  `const_param_default` and `impl_trait_ref`, and removes their `bound_X` variants.

r? `@lcnr`
 2023-01-14 17:44:30 +00:00
Guillaume Gomez de34489a01 Add explanation for GUI test 2023-01-14 18:30:33 +01:00
André Vennberg 2fea03f5e6 Fix some missed double spaces. 2023-01-14 18:26:38 +01:00
André Vennberg 0e65003c9e Fix some missed double spaces. 2023-01-14 18:23:40 +01:00
André Vennberg da3623abab Removed various double spaces in compiler source comments. 2023-01-14 17:34:59 +01:00
André Vennberg 0b35f448f8 Remove various double spaces in source comments. 2023-01-14 17:22:04 +01:00
clubby789 4f64de83bc Fix `unused_braces` on generic const expr macro call 2023-01-14 15:49:08 +00:00
bors 4b51adf6ff Auto merge of #106851 - matthiaskrgr:rollup-d9dz3yp, r=matthiaskrgr 
Rollup of 10 pull requests

Successful merges:

 - #106046 (Fix mir-opt tests for big-endian platforms)
 - #106470 (tidy: Don't include wasm32 in compiler dependency check)
 - #106566 (Emit a single error for contiguous sequences of unknown tokens)
 - #106644 (Update the wasi-libc used for the wasm32-wasi target)
 - #106665 (Add note when `FnPtr` vs. `FnDef` impl trait)
 - #106752 (Emit a hint for bad call return types due to generic arguments)
 - #106788 (Tweak E0599 and elaborate_predicates)
 - #106831 (Use GitHub yaml templates for ICE, Docs and Diagnostics tickets)
 - #106846 (Improve some comments and names in parser)
 - #106848 (Fix wrong path in triage bot autolabel for wg-trait-solver-refactor)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
 2023-01-14 14:50:53 +00:00
Mara Bos 6821adb651 Deprioritize fulfillment errors that come from expansions. 2023-01-14 14:05:26 +01:00
Ethan Brierley 1caec6fa1d fix: misleading add `dyn` to derive macro suggestion 2023-01-14 12:14:06 +00:00
Matthias Krüger 4173c7cc0f
Rollup merge of #106848 - BoxyUwU:correct_triagebot_path, r=WaffleLapkin 
Fix wrong path in triage bot autolabel for wg-trait-solver-refactor
 2023-01-14 13:04:28 +01:00
Matthias Krüger 81da2a19fa
Rollup merge of #106846 - WaffleLapkin:pico_parse_ref, r=TaKO8Ki 
Improve some comments and names in parser

Just a tiny drive-by cleanup.
 2023-01-14 13:04:27 +01:00
Matthias Krüger 2e30e525ac
Rollup merge of #106831 - estebank:tickets_yaml, r=Mark-Simulacrum 
Use GitHub yaml templates for ICE, Docs and Diagnostics tickets

The GitHub yaml templates allow us to define HTML forms with validation for issue templates, instead of the current markdown based templates which only let us introduce text into the user editable text area. The form lets us make some fields mandatory, as well as add text that won't pollute the user's text and titles that won't be interfered with by enterprising users.
 2023-01-14 13:04:27 +01:00
Matthias Krüger 8c538f7d83
Rollup merge of #106788 - estebank:elaborate_pred_E0599, r=compiler-errors 
Tweak E0599 and elaborate_predicates

CC https://github.com/rust-lang/rust/issues/86377.
 2023-01-14 13:04:26 +01:00
Matthias Krüger 108b5f462b
Rollup merge of #106752 - sulami:master, r=estebank 
Emit a hint for bad call return types due to generic arguments

When the return type of a function call depends on the type of an argument, e.g.

```
fn foo<T>(x: T) -> T {
    x
}
```

and the expected type is set due to either an explicitly typed binding, or because the call to the function is in a tail position without semicolon, the current error implies that the argument in the call has the wrong type.

This new hint highlights that the expected type doesn't match the returned type, which matches the argument type, and that that's why we're flagging the argument type.

Fixes #43608.
 2023-01-14 13:04:26 +01:00
Matthias Krüger 3fa9be9094
Rollup merge of #106665 - JulianKnodt:better_fn_trait_note, r=cjgillot 
Add note when `FnPtr` vs. `FnDef` impl trait

I encountered an instance where an `FnPtr` implemented a trait, but I was passing an `FnDef`. I was confused for an hour and to examine the source code of the trait's crate's tests in order to understand how to cast it properly (it didn't help that it was behind a reference). To the end user, it might not be immediately obvious that they are different and how to convert from an `FnDef` to an `FnPtr`, but it is necessary to cast to the generic function in order to compile. It is thus useful to suggest `as` in the help note, (even if the `Fn` output implements the trait).
 2023-01-14 13:04:25 +01:00
Matthias Krüger bc4049d861
Rollup merge of #106644 - alexcrichton:update-wasi-toolchain, r=cuviper 
Update the wasi-libc used for the wasm32-wasi target

This commit updates the wasi-libc revision used to build with the wasm32-wasi target. This notably pulls in WebAssembly/wasi-libc#377 which is needed to fix a use case I've been working on recently. This should be a relatively small update hopefully and is not expected to have any user impact.
 2023-01-14 13:04:25 +01:00
Matthias Krüger 8e0eecdba6
Rollup merge of #106566 - clubby789:contiguous-weird-unicode, r=cjgillot 
Emit a single error for contiguous sequences of unknown tokens

Closes #106101

On encountering a sequence of identical source characters which are unknown tokens, note the amount of subsequent characters and advance past them silently. The old behavior was to emit an error and 'help' note for every single one.

`@rustbot` label +A-diagnostics +A-parser
 2023-01-14 13:04:24 +01:00
Matthias Krüger 27db39b1b3
Rollup merge of #106470 - ehuss:tidy-no-wasm, r=Mark-Simulacrum 
tidy: Don't include wasm32 in compiler dependency check

This changes the tidy compiler dependency check so that it does not include wasm32-unknown-unknown dependencies in the PERMITTED_RUSTC_DEPENDENCIES. This just helps keep the list cleaner under the assumption that the compiler will never work on wasm32-unknown-unknown.

This also fixes a bug in the check to verify there are no unused dependencies in the PERMITTED_RUSTC_DEPENDENCIES. Previously the check was verifying that the dependency was used *anywhere* in the workspace, when it should have been checking if it was used for the compiler.

There's also just a little general cleanup here. For example, the old `normal_deps_of_r` function was changed a while ago to return *all* dependencies, but the function name and description wasn't updated to remove `normal_`.
 2023-01-14 13:04:24 +01:00