1. 08 9月, 2021 4 次提交
  2. 07 9月, 2021 13 次提交
    • B
      Auto merge of #88710 - Mark-Simulacrum:tyvid-idx, r=jackh726 · 69c4aa29
      bors 提交于
      Use index newtyping for TyVid
      
      This is useful for using TyVid in types like VecGraph, and just otherwise seems like a small win.
      69c4aa29
    • M
      Bump RLS submodule · c13808fb
      Mark Rousskov 提交于
      c13808fb
    • B
      Auto merge of #88161 - michaelwoerister:fix-whole-archive-no-bundle, r=petrochenkov · 73641cd2
      bors 提交于
      Fix handling of +whole-archive native link modifier.
      
      This PR fixes a bug in `add_upstream_native_libraries` that led to the `+whole-archive` modifier being ignored when linking in native libs.
      
      ~~Note that the PR does not address the situation when `+whole-archive` is combined with `+bundle`.~~
      `@wesleywiser's` commit adds validation code that turns combining `+whole-archive` with `+bundle` into an error.
      
      Fixes https://github.com/rust-lang/rust/issues/88085.
      
      r? `@petrochenkov`
      cc `@wesleywiser` `@gcoakes`
      73641cd2
    • M
    • B
      Auto merge of #88689 - Aaron1011:confused-std-resolver, r=cjgillot · 385f8e20
      bors 提交于
      Move `confused_type_with_std_module` to `ResolverOutputs`
      
      This eliminates untracked global state from `Session`.
      385f8e20
    • M
      Use index newtyping for TyVid · 2eac09d2
      Mark Rousskov 提交于
      2eac09d2
    • B
      Auto merge of #88448 - xu-cheng:btree-blk-build, r=Mark-Simulacrum · ffaf8570
      bors 提交于
      BTreeMap/BTreeSet::from_iter: use bulk building to improve the performance
      
      Bulk building is a common technique to increase the performance of building a fresh btree map. Instead of inserting items one-by-one, we sort all the items beforehand then create the BtreeMap in bulk.
      
      Benchmark
      ```
      ./x.py bench library/alloc --test-args btree::map::from_iter
      ```
      
      * Before
      ```
      test btree::map::from_iter_rand_100                      ... bench:       3,694 ns/iter (+/- 840)
      test btree::map::from_iter_rand_10_000                   ... bench:   1,033,446 ns/iter (+/- 192,950)
      test btree::map::from_iter_seq_100                       ... bench:       5,689 ns/iter (+/- 1,259)
      test btree::map::from_iter_seq_10_000                    ... bench:     861,033 ns/iter (+/- 118,815)
      ```
      
      * After
      ```
      test btree::map::from_iter_rand_100                      ... bench:       3,033 ns/iter (+/- 707)
      test btree::map::from_iter_rand_10_000                   ... bench:     775,958 ns/iter (+/- 105,152)
      test btree::map::from_iter_seq_100                       ... bench:       2,969 ns/iter (+/- 336)
      test btree::map::from_iter_seq_10_000                    ... bench:     258,292 ns/iter (+/- 29,364)
      ```
      ffaf8570
    • B
      Auto merge of #83214 - cjgillot:dep-map, r=michaelwoerister · 11bbb523
      bors 提交于
      Mmap the incremental data instead of reading it.
      
      Instead of reading the full incremental state using `fs::read_file`, we memmap it using a private read-only file-backed map.
      This allows the system to reclaim any memory we are not using, while ensuring we are not polluted by
      outside modifications to the file.
      
      Suggested in https://github.com/rust-lang/rust/pull/83036#issuecomment-800458082 by `@bjorn3`
      11bbb523
    • B
      Auto merge of #88692 - hyd-dev:miri, r=RalfJung · 1698e3ca
      bors 提交于
      Update Miri
      
      Fixes #88671.
      
      r? `@RalfJung`
      1698e3ca
    • H
      Update `Cargo.lock` · e671c356
      hyd-dev 提交于
      e671c356
    • H
      Update Miri · 6eec72ed
      hyd-dev 提交于
      6eec72ed
    • A
      Move `confused_type_with_std_module` to `ResolverOutputs` · 40440243
      Aaron Hill 提交于
      This eliminates untracked global state from `Session`.
      40440243
    • B
      Auto merge of #88362 - pietroalbini:bump-stage0, r=Mark-Simulacrum · 8ceea01b
      bors 提交于
      Pin bootstrap checksums and add a tool to update it automatically
      
        This is just a proactive hardening we're performing on the build system, and it's not prompted by any known compromise. If you're aware of security issues being exploited please [check out our responsible disclosure page](https://www.rust-lang.org/policies/security).  
      
      ---
      
      This PR aims to improve Rust's supply chain security by pinning the checksums of the bootstrap compiler downloaded by `x.py`, preventing a compromised `static.rust-lang.org` from affecting building the compiler. The checksums are stored in `src/stage0.json`, which replaces `src/stage0.txt`. This PR also adds a tool to automatically update the bootstrap compiler.
      
      The changes in this PR were originally discussed in [Zulip](https://zulip-archive.rust-lang.org/stream/241545-t-release/topic/pinning.20stage0.20hashes.html).
      
      ## Potential attack
      
      Before this PR, an attacker who wanted to compromise the bootstrap compiler would "just" need to:
      
      1. Gain write access to `static.rust-lang.org`, either by compromising DNS or the underlying storage.
      2. Upload compromised binaries and corresponding `.sha256` files to `static.rust-lang.org`.
      
      There is no signature verification in `x.py` as we don't want the build system to depend on GPG. Also, since the checksums were not pinned inside the repository, they were downloaded from `static.rust-lang.org` too: this only protected from accidental changes in `static.rust-lang.org` that didn't change the `*.sha256` files. The attack would allow the attacker to compromise past and future invocations of `x.py`.
      
      ## Mitigations introduced in this PR
      
      This PR adds pinned checksums for all the bootstrap components in `src/stage0.json` instead of downloading the checksums from `static.rust-lang.org`. This changes the attack scenario to:
      
      1. Gain write access to `static.rust-lang.org`, either by compromising DNS or the underlying storage.
      2. Upload compromised binaries to `static.rust-lang.org`.
      3. Land a (reviewed) change in the `rust-lang/rust` repository changing the pinned hashes.
      
      Even with a successful attack, existing clones of the Rust repository won't be affected, and once the attack is detected reverting the pinned hashes changes should be enough to be protected from the attack. This also enables further mitigations to be implemented in following PRs, such as verifying signatures when pinning new checksums (removing the trust on first use aspect of this PR) and adding a check in CI making sure a PR updating the checksum has not been tampered with (see the future improvements section).
      
      ## Additional changes
      
      There are additional changes implemented in this PR to enable the mitigation:
      
      * The `src/stage0.txt` file has been replaced with `src/stage0.json`. The reasoning for the change is that there is existing tooling to read and manipulate JSON files compared to the custom format we were using before, and the slight challenge of manually editing JSON files (no comments, no trailing commas) are not a problem thanks to the new `bump-stage0`.
      
      * A new tool has been added to the repository, `bump-stage0`. When invoked, the tool automatically calculates which release should be used as the bootstrap compiler given the current version and channel, gathers all the relevant checksums and updates `src/stage0.json`. The tool can be invoked by running:
      
        ```
        ./x.py run src/tools/bump-stage0
        ```
      
      * Support for downloading releases from `https://dev-static.rust-lang.org` has been removed, as it's not possible to verify checksums there (it's customary to replace existing artifacts there if a rebuild is warranted). This will require a change to the release process to avoid bumping the bootstrap compiler on beta before the stable release.
      
      ## Future improvements
      
      * Add signature verification as part of `bump-stage0`, which would require the attacker to also obtain the release signing keys in order to successfully compromise the bootstrap compiler. This would be fine to add now, as the burden of installing the tool to verify signatures would only be placed on whoever updates the bootstrap compiler, instead of everyone compiling Rust.
      
      * Add a check on CI that ensures the checksums in `src/stage0.json` are the expected ones. If a PR changes the stage0 file CI should also run the `bump-stage0` tool and fail if the output in CI doesn't match the committed file. This prevents the PR author from tweaking the output of the tool manually, which would otherwise be close to impossible for a human to detect.
      
      * Automate creating the PRs bumping the bootstrap compiler, by setting up a scheduled job in GitHub Actions that runs the tool and opens a PR.
      
      * Investigate whether a similar mitigation can be done for "download from CI" components like the prebuilt LLVM.
      
      r? `@Mark-Simulacrum`
      8ceea01b
  3. 06 9月, 2021 20 次提交
    • B
      Auto merge of #88686 - rylev:rollup-m1tf9ir, r=m-ou-se · 13db8440
      bors 提交于
      Rollup of 6 pull requests
      
      Successful merges:
      
       - #88602 (Add tests for some const generics issues)
       - #88647 (Document when to use Windows' `symlink_dir` vs. `symlink_file`)
       - #88659 (Remove SmallVector mention)
       - #88661 (Correct typo)
       - #88673 (Fix typo: needede -> needed)
       - #88685 ( rust-analyzer)
      
      Failed merges:
      
      r? `@ghost`
      `@rustbot` modify labels: rollup
      13db8440
    • B
      Auto merge of #88678 - matthewjasper:if-boolean-scoping, r=oli-obk · 1c858ba5
      bors 提交于
      Change scope of temporaries in match guards
      
      Each pattern in a match arm has its own copy of the match guard in MIR, with its own temporary, so it has to be dropped before the the guards are joined to the single copy of the arm. This PR changes `then_else_break` to allow it to put the temporary in the innermost scope possible. This change isn't done for `if` expressions because that affects a large number of mir-opt tests and could more significantly affect performance.
      
      closes #88649
      
      r? `@oli-obk`
      1c858ba5
    • R
      Rollup merge of #88685 - lnicola:rust-analyzer-2021-09-06, r=lnicola · 3c4b4615
      Ryan Levick 提交于
       rust-analyzer
      3c4b4615
    • R
      Rollup merge of #88673 - Qwaz:node-typo, r=jyn514 · 0d4a51d7
      Ryan Levick 提交于
      Fix typo: needede -> needed
      
      Fix a typo in library/alloc/src/collections/btree/node.rs
      0d4a51d7
    • R
      Rollup merge of #88661 - est31:typo_fix_in_test, r=joshtriplett · 797f9ce0
      Ryan Levick 提交于
      Correct typo
      
      found while addressing reviewer remarks for #88316
      797f9ce0
    • R
      Rollup merge of #88659 - est31:update_smallvec_name, r=matthewjasper · 5f09e933
      Ryan Levick 提交于
      Remove SmallVector mention
      
      SmallVector is long gone, as it's been first replaced
      by OneVector in commit e5e63753,
      which then has been removed entirely in favour of SmallVec in
      commit 130a32fa.
      5f09e933
    • R
      Rollup merge of #88647 - ChrisDenton:win-symlink-docs, r=joshtriplett · 29a018de
      Ryan Levick 提交于
      Document when to use Windows' `symlink_dir` vs. `symlink_file`
      
      It was previously unclear why there are two functions and when they should be used.
      
      Fixes: #88635
      29a018de
    • R
      Rollup merge of #88602 - BoxyUwU:tests-uwu-nya, r=lcnr · dcd0e1d8
      Ryan Levick 提交于
      Add tests for some const generics issues
      
      closes #82956
      closes #84659
      closes #86530
      closes #86535
      
      there is also a random test in here about array repeat expressions that I already had on this branch but it seems to fit the theme of this PR so kept it...
      
      r? `@lcnr`
      dcd0e1d8
    • L
      rust-analyzer · a48ddcd9
      Laurențiu Nicola 提交于
      a48ddcd9
    • B
      Auto merge of #88631 - camelid:sugg-span, r=davidtwco · d19d864e
      bors 提交于
      Improve structured tuple struct suggestion
      
      Previously, the span was just for the constructor name, which meant it
      would result in syntactically-invalid code when applied. Now, the span
      is for the entire expression.
      
      I also changed it to use `span_suggestion_verbose`, for two reasons:
      
      1. Now that the suggestion span has been corrected, the output is a bit
         cluttered and hard to read. Putting the suggestion its own window
         creates more space.
      
      2. It's easier to see what's being suggested, since now the version
         after the suggestion is applied is shown.
      
      r? `@davidtwco`
      d19d864e
    • B
      Auto merge of #88665 - falk-hueffner:int-log-return-value-u32, r=scottmcm · b2d9bcda
      bors 提交于
      Change return type for T::{log,log2,log10} to u32.
      
      The value is at most 128, and this is consistent with using u32 for small values elsewhere (e.g. BITS, count_ones, leading_zeros).
      b2d9bcda
    • B
      Auto merge of #88640 - SkiFire13:tests-for-85499, r=jackh726 · 0e0ce836
      bors 提交于
      Add tests for issues fixed by #85499
      
      Closes #80706
      Closes #80956
      Closes #81809
      Closes #85455
      0e0ce836
    • B
      Auto merge of #88493 - chenyukang:fix-duplicated-diagnostic, r=estebank · 8f3aa5e8
      bors 提交于
      Fix #88256 remove duplicated diagnostics
      
      Fix #88256
      8f3aa5e8
    • B
      Auto merge of #88435 - cjgillot:no-walk-crate, r=Aaron1011 · 7849e3e9
      bors 提交于
      Avoid invoking the hir_crate query to traverse the HIR
      
      Walking the HIR tree is done using the `hir_crate` query. However, this is unnecessary, since `hir_owner(CRATE_DEF_ID)` provides the same information. Since depending on `hir_crate` forces dependents to always be executed, this leads to unnecessary work.
      
      By splitting HIR and attributes visits, we can avoid an edge to `hir_crate` when trying to visit the HIR tree.
      7849e3e9
    • Y
      Fix typo: needede -> needed · 3a105cfc
      Yechan Bae 提交于
      3a105cfc
    • B
      Auto merge of #88552 - nbdd0121:vtable, r=nagisa · e30b6835
      bors 提交于
      Stop allocating vtable entries for non-object-safe methods
      
      Current a vtable entry is allocated for all associated fns, even if the method is not object-safe: https://godbolt.org/z/h7vx6f35T
      
      As a result, each vtable for `Iterator`' currently consumes 74 `usize`s. This PR stops allocating vtable entries for those methods, reducing vtable size of each `Iterator` vtable to 7 `usize`s.
      
      Note that this PR introduces will cause more invocations of `is_vtable_safe_method`. So a perf run might be needed. If result isn't favorable then we might need to query-ify `is_vtable_safe_method`.
      e30b6835
    • M
      Change scope of temporaries in match guards · ad7f109b
      Matthew Jasper 提交于
      Each pattern in a match arm has its own copy of the match guard in MIR,
      with its own temporary, so it has to be dropped before the the guards
      are joined to the single copy of the arm.
      ad7f109b
    • G
      Add query `own_existential_vtable_entries` · 97214eec
      Gary Guo 提交于
      97214eec
    • G
      871eb623
    • B
      Auto merge of #88499 - eddyb:layout-off, r=nagisa · e2750baf
      bors 提交于
      Provide `layout_of` automatically (given tcx + param_env + error handling).
      
      After #88337, there's no longer any uses of `LayoutOf` within `rustc_target` itself, so I realized I could move the trait to `rustc_middle::ty::layout` and redesign it a bit.
      
      This is similar to #88338 (and supersedes it), but at no ergonomic loss, since there's no funky `C: LayoutOf<Ty = Ty>` -> `Ty: TyAbiInterface<C>` generic `impl` chain, and each `LayoutOf` still corresponds to one `impl` (of `LayoutOfHelpers`) for the specific context.
      
      After this PR, this is what's needed to get `trait LayoutOf` (with the `layout_of` method) implemented on some context type:
      * `TyCtxt`, via `HasTyCtxt`
      * `ParamEnv`, via `HasParamEnv`
      * a way to transform `LayoutError`s into the desired error type
        * an error type of `!` can be paired with having `cx.layout_of(...)` return `TyAndLayout` *without* `Result<...>` around it, such as used by codegen
        * this is done through a new `LayoutOfHelpers` trait (and so is specifying the type of `cx.layout_of(...)`)
      
      When going through this path (and not bypassing it with a manual `impl` of `LayoutOf`), the end result is that only the error case can be customized, the query itself and the success paths are guaranteed to be uniform.
      
      (**EDIT**: just noticed that because of the supertrait relationship, you cannot actually implement `LayoutOf` yourself, the blanket `impl` fully covers all possible context types that could ever implement it)
      
      Part of the motivation for this shape of API is that I've been working on querifying `FnAbi::of_*`, and what I want/need to introduce for that looks a lot like the setup in this PR - in particular, it's harder to express the `FnAbi` methods in `rustc_target`, since they're much more tied to `rustc` concepts.
      
      r? `@nagisa` cc `@oli-obk` `@bjorn3`
      e2750baf
  4. 05 9月, 2021 3 次提交
    • F
      Change return type for T::{log,log2,log10} to u32. The value is at · d760c331
      Falk Hüffner 提交于
      most 128, and this is consistent with using u32 for small values
      elsewhere (e.g. BITS, count_ones, leading_zeros).
      d760c331
    • B
      Auto merge of #88604 - camelid:rustdoc-lifetime-bounds, r=GuillaumeGomez · f7c00dc4
      bors 提交于
      rustdoc: Clean up handling of lifetime bounds
      
      Previously, rustdoc recorded lifetime bounds by rendering them into the
      name of the lifetime parameter. Now, it leaves the name as the actual
      name and instead records lifetime bounds in an `outlives` list, similar
      to how type parameter bounds are recorded.
      
      Also, higher-ranked lifetimes cannot currently have bounds, so I simplified
      the code to reflect that.
      
      r? `@GuillaumeGomez`
      f7c00dc4
    • B
      Auto merge of #88662 - m-ou-se:rollup-h6lgp7k, r=m-ou-se · 7e1e3eb5
      bors 提交于
      Rollup of 4 pull requests
      
      Successful merges:
      
       - #88257 (Provide more context on incorrect inner attribute)
       - #88432 (Fix a typo in raw_vec)
       - #88511 (x.py clippy: don't run with --all-targets by default)
       - #88657 (Fix 2021 `dyn` suggestion that used code as label)
      
      Failed merges:
      
      r? `@ghost`
      `@rustbot` modify labels: rollup
      7e1e3eb5