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 9 pull requests #126878

Merged
merged 22 commits into from
Jun 23, 2024
Merged

Rollup of 9 pull requests #126878

merged 22 commits into from
Jun 23, 2024

Commits on Jun 10, 2024

  1. Revert "Update rustc-perf submodule before running tidy"

    This reverts commit faac70b.
    onur-ozkan committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    dd50e18 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. tidy: skip submodules if not present for non-CI environments

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    e9e3c38 View commit details
    Browse the repository at this point in the history
  2. Update outdated README in build-manifest.

    I believe this was changed a while ago in rust-lang/promote-release#14.
    ehuss committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    455e2f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. replace remove_dir with remove_dir_all in helpers::symlink_dir

    When using `symlink_dir`, it first removes the existing link with `remove_dir`.
    However, if the path isn't a link and contains files, `remove_dir` fails
    with "DirectoryNotEmpty", which causes the symbolic linking to fail as well.
    We have this problem on linking 'rustlib/rust' because it contains files as an
    actual directory.
    
    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    f76c3b7 View commit details
    Browse the repository at this point in the history
  2. make codegen-backend config warning less noisy

    If `codegen-backends` is missing "cranelift" and "gcc" (which is common),
    bootstrap will now only show this warning during `dist` and `install` steps,
    or if codegen-backends was explicitly called for build.
    
    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    onur-ozkan committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    521e707 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Configuration menu
    Copy the full SHA
    279bf05 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Configuration menu
    Copy the full SHA
    0937996 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    763e313 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0a26595 View commit details
    Browse the repository at this point in the history
  4. Import NonterminalKind in compiler/rustc_expand/src/mbe/quoted.rs.

    So we can omit the `token::` qualifier, which gives more space to some
    cramped code.
    nnethercote committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    470b0e9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    70fa67c View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. Rework pattern and expression nonterminal kinds.

    Merge `PatParam`/`PatWithOr`, and `Expr`/`Expr2021`, for a few reasons.
    
    - It's conceptually nice, because the two pattern kinds and the two
      expression kinds are very similar.
    
    - With expressions in particular, there are several places where both
      expression kinds get the same treatment.
    
    - It removes one unreachable match arm.
    
    - Most importantly, for rust-lang#124141 I will need to introduce a new type
      `MetaVarKind` that is very similar to `NonterminalKind`, but records a
      couple of extra fields for expression metavars. It's nicer to have a
      single `MetaVarKind::Expr` expression variant to hold those extra
      fields instead of duplicating them across two variants
      `MetaVarKind::{Expr,Expr2021}`. And then it makes sense for patterns
      to be treated the same way, and for `NonterminalKind` to also be
      treated the same way.
    
    I also clarified the comments, because I have long found them a little
    hard to understand.
    nnethercote committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    e2aa38e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b8a0030 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#126230 - onur-ozkan:followup-126225, r=Mark…

    …-Simulacrum
    
    tidy: skip submodules if not present for non-CI environments
    
    Right now tidy requires rustc-perf to be fetched as it checks its license, but this doesn't make sense for most contributors since rustc-perf is a dist-specific tool and its license will not change frequently, especially during compiler development. This PR makes tidy to skip rustc-perf if it's not fetched and if it's not running in CI.
    
    Applies rust-lang#126225 (comment) and reverts rust-lang#126225.
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    f016552 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#126612 - ehuss:build-manifest-readme, r=Mar…

    …k-Simulacrum
    
    Update outdated README in build-manifest.
    
    I believe this was changed a while ago in rust-lang/promote-release#14.
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    0eff9fb View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#126616 - onur-ozkan:less-warnings, r=Mark-S…

    …imulacrum
    
    less bootstrap warnings
    
    This is how the build logs looks like currently:
    
    ```sh
    $ x build
    Building bootstrap
       Compiling bootstrap v0.0.0 (/home/nimda/devspace/onur-ozkan/rust/src/bootstrap)
        Finished `dev` profile [unoptimized] target(s) in 3.43s
    WARNING: no codegen-backends config matched the requested path to build a codegen backend. HELP: add backend to codegen-backends in config.toml.
    WARNING: creating symbolic link `/home/nimda/devspace/.other/rustc-builds/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/rustc-src/rust` to `/home/nimda/devspace/onur-ozkan/rust` failed with File exists (os
    error 17)
    Creating a sysroot for stage2 compiler (use `rustup toolchain link 'name' build/host/stage2`)
    WARNING: creating symbolic link `/home/nimda/devspace/.other/rustc-builds/build/x86_64-unknown-linux-gnu/ci-rustc-sysroot/lib/rustlib/rustc-src/rust` to `/home/nimda/devspace/onur-ozkan/rust` failed with File e
    xists (os error 17)
    Building tool rustdoc (stage1 -> stage2, x86_64-unknown-linux-gnu)
       Compiling rustdoc v0.0.0 (/home/nimda/devspace/onur-ozkan/rust/src/librustdoc)
       Compiling rustdoc-tool v0.0.0 (/home/nimda/devspace/onur-ozkan/rust/src/tools/rustdoc)
        Finished `release` profile [optimized + debuginfo] target(s) in 13.57s
    Build completed successfully in 0:00:17
    ```
    
    This PR removes artifact linking warnings and only shows the codegen-backend warning if explicitly called or during Dist or Install steps.
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    4a3863e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6736641 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#126830 - RalfJung:unsized-fn-params, r=comp…

    …iler-errors
    
    make unsized_fn_params an internal feature
    
    As suggested [here](rust-lang#123894 (comment)).
    r? `@compiler-errors`
    
    Fixes rust-lang#123887 (kind of -- ICEs on internal features are considered acceptable so this issue is not-a-bug once this PR lands)
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    0a7adaf View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#126833 - RalfJung:extern-type-field-ice, r=…

    …compiler-errors
    
    don't ICE when encountering an extern type field during validation
    
    "extern type" is a pain that keeps on giving...
    
    Fixes rust-lang#126814
    
    r? ```@oli-obk```
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    a9959bd View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#126837 - petrochenkov:delegfix, r=compiler-…

    …errors
    
    delegation: Do not crash on qpaths without a trait
    
    Fixes rust-lang#126742
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    2c0311d View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#126851 - nnethercote:NtExprKind-NtPatKind, …

    …r=compiler-errors
    
    Rework pattern and expression nonterminal kinds.
    
    Some tweaks to `NonterminalKind` that will assist with rust-lang#124141. Details in the individual commits.
    
    r? compiler-errors
    cc ```@eholk```
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    0149bc4 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#126862 - ChrisDenton:needs-symlink, r=jieyouxu

    Add needs-symlink directive to compiletest
    
    This is an alternative to rust-lang#126846 that allows running symlink tests on Windows in CI but will ignore them locally if symlinks aren't available. A future improvement would be to check that the `needs-symlink` directive is used in rmake files that call `create_symlink` but this is just a quick PR to unblock Windows users who want to run tests locally without enabling symlinks.
    matthiaskrgr authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    e4f102d View commit details
    Browse the repository at this point in the history