Rollup of 6 pull requests #103436

Dylan-DPC · 2022-10-23T14:15:27Z

Successful merges:

make unaligned_reference a hard error #102513 (make unaligned_reference a hard error)
kmc-solid: Handle errors returned by SOLID_FS_ReadDir #103005 (kmc-solid: Handle errors returned by SOLID_FS_ReadDir)
Add diagnostic for calling a function with the same name with unresolved Macro #103140 (Add diagnostic for calling a function with the same name with unresolved Macro)
rustdoc: do not filter out cross-crate Self: Sized bounds #103254 (rustdoc: do not filter out cross-crate Self: Sized bounds)
Fix wrapped valid-range handling in ty_find_init_error #103402 (Fix wrapped valid-range handling in ty_find_init_error)
rustdoc: remove no-op CSS .code-header { border-bottom: none } #103424 (rustdoc: remove no-op CSS .code-header { border-bottom: none })

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…same name when a Macro is not found

Co-authored-by: Oli Scherer <[email protected]>

Rust's niche handling allows for wrapping valid ranges with end < start; for instance, a valid range with start=43 and end=41 means a niche of 42. Most places in the compiler handle this correctly, but ty_find_init_error assumed that `lo > 0` means the type cannot contain a zero. Fix it to handle wrapping ranges. Add a test to cover this case.

The code headers are always h3 or h4, which don't have border-bottom by default anyway.

…ce, r=cjgillot make unaligned_reference a hard error The `unaligned_references` lint has been warn-by-default since Rust 1.53 (rust-lang#82525) and deny-by-default with mention in cargo future-incompat reports since Rust 1.62 (rust-lang#95372). Current nightly will become Rust 1.66, so (unless major surprises show up with crater) I think it is time we make this a hard error, and close this old soundness gap in the language. Fixes rust-lang#82523.

…erminator, r=m-ou-se kmc-solid: Handle errors returned by `SOLID_FS_ReadDir` Fixes the issue where the `std::fs::ReadDir` implementaton of the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets silently suppressed errors returned by the underlying `SOLID_FS_ReadDir` system function. The new implementation correctly handles all cases: - `SOLID_ERR_NOTFOUND` indicates the end of directory stream. - `SOLID_ERR_OK` + non-empty `d_name` indicates success. - Some old filesystem drivers may return `SOLID_ERR_OK` + empty `d_name` to indicate the end of directory stream. - Any other negative values (per ITRON convention) represent an error.

…tebank Add diagnostic for calling a function with the same name with unresolved Macro Fixes rust-lang#103112

rustdoc: do not filter out cross-crate `Self: Sized` bounds All type parameters **except `Self`** are implicitly `Sized` ([via](https://doc.rust-lang.org/nightly/std/marker/trait.Sized.html)). Previously, we disregarded the exception of `Self` and omitted cross-crate `Sized` bounds of *any* type parameter *including* `Self` when rendering. From now on, we *do* render cross-crate `Self: Sized` bounds. Most notably, in `std` we now finally properly render the `Sized` bound of the `Clone` trait as well as the `Self: Sized` bound on `Iterator::map`. Fixes rust-lang#24183. `@rustbot` label T-rustdoc A-cross-crate-reexports r? rustdoc

…-obk Fix wrapped valid-range handling in ty_find_init_error Rust's niche handling allows for wrapping valid ranges with end < start; for instance, a valid range with start=43 and end=41 means a niche of 42. Most places in the compiler handle this correctly, but `ty_find_init_error` assumed that `lo > 0` means the type cannot contain a zero. Fix it to handle wrapping ranges.

…rder-bottom-none, r=GuillaumeGomez rustdoc: remove no-op CSS `.code-header { border-bottom: none }` The code headers are always h3 or h4, which don't have border-bottom by default anyway.

fmease · 2022-10-23T15:56:37Z

missing [@]bors r+ approval or intentional?

Dylan-DPC · 2022-10-23T17:32:03Z

wasnt intentional but good thing is at least we know that CI passes :P thanks

@bors r+ rollup=never p=5

bors · 2022-10-23T17:32:05Z

📌 Commit eee00d4 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-10-23T18:10:57Z

⌛ Testing commit eee00d4 with merge bacb07218b957be0c0494d0c6081bd3b42a24f34...

bors · 2022-10-23T18:52:00Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-10-23T19:12:13Z

The job x86_64-msvc-cargo failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling rand v0.7.3
   Compiling remove_dir_all v0.5.2
   Compiling tempfile v3.1.0
   Compiling tokei v10.1.2 (D:\a\rust\rust\build\ct\tokei)
error[E0791]: `Debug` can't be derived on this `#[repr(packed)]` struct that does not derive `Copy`
    |
    |
263 |           #[repr(C)] #[derive(Debug)] $(#[$attrs])*
    |
   ::: C:\Users\runneradmin\.cargo\registry\src\github.com-1ecc6299db9ec823\winapi-0.2.8\src\mmreg.rs:290:1
    |
    |
290 | / STRUCT!{#[repr(packed)] struct WAVEFORMATEX {
291 | |     wFormatTag: ::WORD,
292 | |     nChannels: ::WORD,
293 | |     nSamplesPerSec: ::DWORD,
297 | |     cbSize: ::WORD,
298 | | }}
    | |__- in this macro invocation
    |
    |
    = note: this error originates in the derive macro `Debug` which comes from the expansion of the macro `STRUCT` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0791]: `Debug` can't be derived on this `#[repr(packed)]` struct that does not derive `Copy`
    |
    |
263 |           #[repr(C)] #[derive(Debug)] $(#[$attrs])*
    |
   ::: C:\Users\runneradmin\.cargo\registry\src\github.com-1ecc6299db9ec823\winapi-0.2.8\src\mmreg.rs:299:1
    |
    |
299 | / STRUCT!{#[repr(packed)] struct WAVEFORMATEXTENSIBLE {
300 | |     Format: ::WAVEFORMATEX,
301 | |     Samples: ::WORD,
302 | |     dwChannelMask: ::DWORD,
303 | |     SubFormat: ::GUID,
304 | | }}
    |
    = note: this error originates in the derive macro `Debug` which comes from the expansion of the macro `STRUCT` (in Nightly builds, run with -Z macro-backtrace for more info)


error[E0791]: `Debug` can't be derived on this `#[repr(packed)]` struct that does not derive `Copy`
    |
    |
263 |           #[repr(C)] #[derive(Debug)] $(#[$attrs])*
    |
    |
   ::: C:\Users\runneradmin\.cargo\registry\src\github.com-1ecc6299db9ec823\winapi-0.2.8\src\usbspec.rs:26:1
    |
26  | / STRUCT!{#[repr(packed)] struct USB_CONFIGURATION_DESCRIPTOR {
27  | |     bLength: ::UCHAR,
28  | |     bDescriptorType: ::UCHAR,
29  | |     wTotalLength: ::USHORT,
...   |
34  | |     MaxPower: ::UCHAR,
35  | | }}
    |
    = note: this error originates in the derive macro `Debug` which comes from the expansion of the macro `STRUCT` (in Nightly builds, run with -Z macro-backtrace for more info)


error[E0791]: `Debug` can't be derived on this `#[repr(packed)]` struct that does not derive `Copy`
    |
    |
263 |           #[repr(C)] #[derive(Debug)] $(#[$attrs])*
    |
   ::: C:\Users\runneradmin\.cargo\registry\src\github.com-1ecc6299db9ec823\winapi-0.2.8\src\winusb.rs:8:1
    |
    |
8   | / STRUCT!{#[repr(packed)] struct WINUSB_SETUP_PACKET {
9   | |     RequestType: ::UCHAR,
10  | |     Request: ::UCHAR,
11  | |     Value: ::USHORT,
12  | |     Index: ::USHORT,
13  | |     Length: ::USHORT,
14  | | }}
    |
    = note: this error originates in the derive macro `Debug` which comes from the expansion of the macro `STRUCT` (in Nightly builds, run with -Z macro-backtrace for more info)

For more information about this error, try `rustc --explain E0791`.

RalfJung and others added 15 commits October 11, 2022 23:39

make unaligned_reference a hard error

0e49948

fix Miri test

4ddf1b5

kmc-solid: Handle errors returned by SOLID_FS_ReadDir

76bec17

rustdoc: Do not filter out Self: Sized bounds

f543770

fix rust-lang#103112, add diagnostic for calling a function with the …

1225c3f

…same name when a Macro is not found

fix span for suggestion

f90bf50

fix typo

a0cc385

Co-authored-by: Oli Scherer <[email protected]>

rustdoc: remove no-op CSS .code-header { border-bottom: none }

7ff9bc1

The code headers are always h3 or h4, which don't have border-bottom by default anyway.

Rollup merge of rust-lang#103140 - chenyukang:yukang/fix-103112, r=es…

6a3affb

…tebank Add diagnostic for calling a function with the same name with unresolved Macro Fixes rust-lang#103112

Rollup merge of rust-lang#103424 - notriddle:notriddle/code-header-bo…

eee00d4

…rder-bottom-none, r=GuillaumeGomez rustdoc: remove no-op CSS `.code-header { border-bottom: none }` The code headers are always h3 or h4, which don't have border-bottom by default anyway.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 23, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 23, 2022

Dylan-DPC mentioned this pull request Oct 24, 2022

make unaligned_reference a hard error #102513

Merged

Dylan-DPC closed this Oct 24, 2022

Dylan-DPC deleted the rollup-0la5x8u branch October 24, 2022 05:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #103436

Rollup of 6 pull requests #103436

Uh oh!

Dylan-DPC commented Oct 23, 2022

Uh oh!

fmease commented Oct 23, 2022

Uh oh!

Dylan-DPC commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

rust-log-analyzer commented Oct 23, 2022

Uh oh!

Uh oh!

Rollup of 6 pull requests #103436

Rollup of 6 pull requests #103436

Uh oh!

Conversation

Dylan-DPC commented Oct 23, 2022

Uh oh!

fmease commented Oct 23, 2022

Uh oh!

Dylan-DPC commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

bors commented Oct 23, 2022

Uh oh!

rust-log-analyzer commented Oct 23, 2022

Uh oh!

Uh oh!