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

Automatic Rustup #3264

Merged
merged 17 commits into from
Jan 11, 2024
Merged

Automatic Rustup #3264

merged 17 commits into from
Jan 11, 2024

Commits on Jan 9, 2024

  1. Add missing DiagnosticBuilder::eager_diagnostic method.

    This lets us avoid the use of `DiagnosticBuilder::into_diagnostic` in
    miri, when then means that `DiagnosticBuilder::into_diagnostic` can
    become private, being now only used by `stash` and `buffer`.
    nnethercote committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    1f582be View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Auto merge of #119751 - nnethercote:error-api-fixes, r=oli-obk

    Diagnostic API fixes
    
    Some improvements to diagnostic APIs: improve some naming, use shortcuts in more places, and add a couple of missing methods.
    
    r? `@compiler-errors`
    bors committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    60c8f35 View commit details
    Browse the repository at this point in the history
  2. Change how force-warn lint diagnostics are recorded.

    `is_force_warn` is only possible for diagnostics with `Level::Warning`,
    but it is currently stored in `Diagnostic::code`, which every diagnostic
    has.
    
    This commit:
    - removes the boolean `DiagnosticId::Lint::is_force_warn` field;
    - adds a `ForceWarning` variant to `Level`.
    
    Benefits:
    - The common `Level::Warning` case now has no arguments, replacing
      lots of `Warning(None)` occurrences.
    - `rustc_session::lint::Level` and `rustc_errors::Level` are more
      similar, both having `ForceWarning` and `Warning`.
    nnethercote committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    b47e611 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Auto merge of #119688 - Nadrieril:dont-alloc-custom-wildcards, r=comp…

    …iler-errors
    
    Exhaustiveness: use an `Option` instead of allocating fictitious patterns
    
    In the process of exhaustiveness checking, `Matrix` stores a 2D array of patterns. Those are subpatterns of the patterns we were provided as input, _except_ sometimes we allocate some extra wildcard patterns to fill a hole during specialization.
    
    Morally though, we could store `Option<&'p DeconstructedPat>` in the matrix, where `None` signifies a wildcard. That way we'd only have "real" patterns in the matrix and we wouldn't need the arena to allocate these wildcards. This is what this PR does.
    
    This is part of me splitting up rust-lang/rust#119581 for ease of review.
    
    r? `@compiler-errors`
    bors committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    814cf0d View commit details
    Browse the repository at this point in the history
  2. Rollup merge of #115046 - joshtriplett:master, r=compiler-errors

    Use version-sorting for all sorting
    
    Add a description of a version-sorting algorithm. (This algorithm does
    not precisely match `strverscmp`; it's intentionally simpler in its
    handling of leading zeroes, and produces a result easier for humans to
    easily understand and do by hand.)
    
    Change all references to sorting to use version-sorting.
    
    Change all references to "ASCIIbetically" to instead say "sort
    non-lowercase before lowercase".
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    2aa0d1b View commit details
    Browse the repository at this point in the history
  3. Rollup merge of #118915 - compiler-errors:alias-nits, r=lcnr

    Add some comments, add `can_define_opaque_ty` check to `try_normalize_ty_recur`
    
    Follow-up from #117278, since I was recently re-reviewing this code.
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    29968be View commit details
    Browse the repository at this point in the history
  4. Rollup merge of #119637 - aoli-al:master, r=cuviper

    Pass LLVM error message back to pass wrapper.
    
    When rustc fails to load a plugin, it should provide more detailed error message. Before this PR, rustc prints:
    
    ```
    error: failed to run LLVM passes: Failed to load pass pluginPLUGIN_NAME.so
    ```
    
    This PR passes LLVM errors back to rustc. After this PR, rustc prints:
    
    ```
    error: failed to run LLVM passes: Could not load library 'PLUGIN_NAME.so': PLUGIN_NAME.so: undefined symbol: _ZN4llvm9DebugFlagE
    ```
    
    This PR only contains usability improvements and does not change any functionality. Thus, no new unit test is implemented.
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    1da4ffa View commit details
    Browse the repository at this point in the history
  5. Rollup merge of #119715 - Nadrieril:graceful-type-error, r=compiler-e…

    …rrors
    
    Exhaustiveness: abort on type error
    
    This adds an error path to exhaustiveness checking so that we abort instead of ICEing when encountering a stray `ty::Error`.
    
    Fixes rust-lang/rust#119493
    Fixes rust-lang/rust#119778
    
    r? `@compiler-errors`
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    173afdb View commit details
    Browse the repository at this point in the history
  6. Rollup merge of #119763 - nnethercote:cleanup-Diagnostic, r=oli-obk

    Cleanup things in and around `Diagnostic`
    
    These changes all arose when I was looking closely at how to simplify `DiagCtxtInner::emit_diagnostic`.
    
    r? `@compiler-errors`
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    5fd3c36 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of #119788 - mj10021:issue-119787-fix, r=oli-obk

    change function name in comments
    
    fixes #119787 where I believe an incorrect function name is used in the comments
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3767172 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of #119790 - celinval:smir-all-traits, r=oli-obk

    Fix all_trait* methods to return all traits available in StableMIR
    
    Also provide a mechanism to retrieve traits and implementations for a given crate.
    
    This fixes rust-lang/project-stable-mir#37
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    48b44f8 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of #119803 - oli-obk:even_more_follow_up_errors, r=compi…

    …ler-errors
    
    Silence some follow-up errors [1/x]
    
    this is one piece of the requested cleanups from rust-lang/rust#117449
    
    When we use `-> impl SomeTrait<_>` as a return type, we are both using the "infer return type suggestion" code path, and the infer opaque type code path within the same function. That can lead to confusing diagnostics, so silence all opaque type diagnostics in that case.
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    5f4772e View commit details
    Browse the repository at this point in the history
  10. Rollup merge of #119804 - tmccombs:stabilize-unpoison, r=cuviper

    Stabilize mutex_unpoison feature
    
    Closes #96469
    
    `@rustbot` +T-libs-api
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    cef77ba View commit details
    Browse the repository at this point in the history
  11. Rollup merge of #119832 - fmease:project-const-traits-triagebot, r=co…

    …mpiler-errors
    
    Meta: Add project const traits to triagebot config
    
    r? compiler-errors or project-const-traits
    matthiaskrgr authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    b5f59ea View commit details
    Browse the repository at this point in the history
  12. Auto merge of #119837 - matthiaskrgr:rollup-l2olpad, r=matthiaskrgr

    Rollup of 11 pull requests
    
    Successful merges:
    
     - #115046 (Use version-sorting for all sorting)
     - #118915 (Add some comments, add `can_define_opaque_ty` check to `try_normalize_ty_recur`)
     - #119006 (Fix is_global special address handling)
     - #119637 (Pass LLVM error message back to pass wrapper.)
     - #119715 (Exhaustiveness: abort on type error)
     - #119763 (Cleanup things in and around `Diagnostic`)
     - #119788 (change function name in comments)
     - #119790 (Fix all_trait* methods to return all traits available in StableMIR)
     - #119803 (Silence some follow-up errors [1/x])
     - #119804 (Stabilize mutex_unpoison feature)
     - #119832 (Meta: Add project const traits to triagebot config)
    
    r? `@ghost`
    `@rustbot` modify labels: rollup
    bors committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    74785ec View commit details
    Browse the repository at this point in the history
  13. Preparing for merge from rustc

    The Miri Conjob Bot committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    7d80597 View commit details
    Browse the repository at this point in the history
  14. Merge from rustc

    The Miri Conjob Bot committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    50f1e38 View commit details
    Browse the repository at this point in the history