Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #114565

Merged
merged 13 commits into from
Aug 7, 2023
Merged

Rollup of 6 pull requests #114565

merged 13 commits into from
Aug 7, 2023

Commits on Aug 6, 2023

  1. Configuration menu
    Copy the full SHA
    55935df View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    09c71a5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0c59544 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    efd54cc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    704aa56 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2b9876b View commit details
    Browse the repository at this point in the history
  7. Remove FIXME about NLL diagnostic that is already improved

    The FIXME was added in 46984 when the diagnostic message looked like
    this:
    
        // FIXME(rust-lang#46983): error message should be better
        &s.0 //~ ERROR free region `` does not outlive free region `'static`
    
    The message was improved in 90667 and now looks like this:
    
        &s.0 //~ ERROR lifetime may not live long enough
    
    but the FIXME was not removed. The issue 46983 about that diagnostics
    should be improved has been closed. We can remove the FIXME now.
    Enselic committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    8a75209 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#114535 - klensy:windows-sys-0-42, r=compile…

    …r-errors
    
    bump schannel, miow to drop windows-sys 0.42
    
    Changes contains almost only of update to windows-sys 0.48
    steffengy/schannel-rs@v0.1.21...v0.1.22
    yoshuawuyts/miow@v0.5.0...v0.6.0
    matthiaskrgr authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    22d142a View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#114542 - RalfJung:const-prop-nonsense, r=co…

    …mpiler-errors
    
    interpret: use ConstPropNonsense for more const-prop induced issues
    matthiaskrgr authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    74dce18 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#114543 - RalfJung:test-96944, r=compiler-er…

    …rors
    
    add tests for some fixed ConstProp ICEs
    
    Fixes rust-lang#96944
    Fixes rust-lang#111353
    matthiaskrgr authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    d720f93 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#114550 - dtolnay:globalalloc, r=compiler-er…

    …rors
    
    Generate better function argument names in global_allocator expansion
    
    Generated code for `#[global_allocator] static ALLOCATOR: Allocator = Allocator;`—
    
    **Before:**
    
    ```rust
    const _: () = {
        #[rustc_std_internal_symbol]
        unsafe fn __rust_alloc(arg0: usize, arg1: usize) -> *mut u8 {
            ::core::alloc::GlobalAlloc::alloc(
                &ALLOCATOR,
                ::core::alloc::Layout::from_size_align_unchecked(arg0, arg1),
            )
        }
        #[rustc_std_internal_symbol]
        unsafe fn __rust_dealloc(arg0: *mut u8, arg1: usize, arg2: usize) -> () {
            ::core::alloc::GlobalAlloc::dealloc(
                &ALLOCATOR,
                arg0,
                ::core::alloc::Layout::from_size_align_unchecked(arg1, arg2),
            )
        }
        #[rustc_std_internal_symbol]
        unsafe fn __rust_realloc(
            arg0: *mut u8,
            arg1: usize,
            arg2: usize,
            arg3: usize,
        ) -> *mut u8 {
            ::core::alloc::GlobalAlloc::realloc(
                &ALLOCATOR,
                arg0,
                ::core::alloc::Layout::from_size_align_unchecked(arg1, arg2),
                arg3,
            )
        }
        #[rustc_std_internal_symbol]
        unsafe fn __rust_alloc_zeroed(arg0: usize, arg1: usize) -> *mut u8 {
            ::core::alloc::GlobalAlloc::alloc_zeroed(
                &ALLOCATOR,
                ::core::alloc::Layout::from_size_align_unchecked(arg0, arg1),
            )
        }
    };
    ```
    
    **After:**
    
    ```rust
    const _: () = {
        #[rustc_std_internal_symbol]
        unsafe fn __rust_alloc(size: usize, align: usize) -> *mut u8 {
            ::core::alloc::GlobalAlloc::alloc(
                &ALLOCATOR,
                ::core::alloc::Layout::from_size_align_unchecked(size, align),
            )
        }
        #[rustc_std_internal_symbol]
        unsafe fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize) -> () {
            ::core::alloc::GlobalAlloc::dealloc(
                &ALLOCATOR,
                ptr,
                ::core::alloc::Layout::from_size_align_unchecked(size, align),
            )
        }
        #[rustc_std_internal_symbol]
        unsafe fn __rust_realloc(
            ptr: *mut u8,
            size: usize,
            align: usize,
            new_size: usize,
        ) -> *mut u8 {
            ::core::alloc::GlobalAlloc::realloc(
                &ALLOCATOR,
                ptr,
                ::core::alloc::Layout::from_size_align_unchecked(size, align),
                new_size,
            )
        }
        #[rustc_std_internal_symbol]
        unsafe fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8 {
            ::core::alloc::GlobalAlloc::alloc_zeroed(
                &ALLOCATOR,
                ::core::alloc::Layout::from_size_align_unchecked(size, align),
            )
        }
    };
    ```
    matthiaskrgr authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    1ea9951 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#114556 - Enselic:issue-numbers-enforced, r=…

    …compiler-errors
    
    Issue numbers are enforced on active features; remove FIXME
    
    Since rust-lang#51090 tidy enforces that active features have an issue number, so remove the FIXME.
    
    This PR is part of rust-lang#44366 which is E-help-wanted.
    matthiaskrgr authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    44479d1 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#114558 - Enselic:lifetime-diagnostic-fixed,…

    … r=cjgillot
    
    Remove FIXME about NLL diagnostic that is already improved
    
    The FIXME was added in rust-lang#46984 when the diagnostic message looked like this:
    
        // FIXME(rust-lang#46983): error message should be better
        &s.0 //~ ERROR free region `` does not outlive free region `'static`
    
    The message was improved in rust-lang#90667 and now looks like this:
    
        &s.0 //~ ERROR lifetime may not live long enough
    
    but the FIXME was not removed. The issue rust-lang#46983 about that diagnostics should be improved has been closed. We can remove the FIXME now.
    
    (This PR was made for rust-lang#44366.)
    matthiaskrgr authored Aug 6, 2023
    Configuration menu
    Copy the full SHA
    f44f027 View commit details
    Browse the repository at this point in the history