Skip to content

Rollup of 16 pull requests - #82025

Merged
bors merged 35 commits into
rust-lang:masterfrom
JohnTitor:rollup-cohp0gy
Feb 12, 2021
Merged

Rollup of 16 pull requests#82025
bors merged 35 commits into
rust-lang:masterfrom
JohnTitor:rollup-cohp0gy

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petar-dambovalievand others added 30 commits December 12, 2020 23:08
Move the note about dropping cloudabi next to the other platform support
changes.
Introduced in d3c4dbd, noticed only
after the fact, sorry. 😅
Signed-off-by: Daniel Egger <daniel@eggers-club.de>
Fixesrust-lang#81928
“Ask forgiveness not permission” : this makes the code both simpler and more robust
Since it was missing, it wasn't possible to really use rustc-dev to
build, see for instance: rust-lang/rust-analyzer#7589.
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
The issue was that the `kind, id` override was previously only being
considered for the disambiguator check, not the privacy check. This uses
the same ID for both.
insted -> instead
…melid
Don't display `mut` in arguments for functions documentation
Fixesrust-lang#81289 by reverting rust-lang#80799, as requested in rust-lang#81328 (comment).
Supersedes rust-lang#81328.
r? ``@camelid`` cc ``@jyn514``
Relax ItemCtxt::to_ty lifetime
Tiny simplification by relaxing a lifetime.
…atform-notes, r=XAMPPRocky
RELEASES.md 1.50: Group platform support notes together
Move the note about dropping cloudabi next to the other platform support
changes.
bootstrap: Locate llvm-dwp based on llvm-config bindir
Fixesrust-lang#81949.
Tested by successfully building 1.50.0 pre-release, which is where I originally hit the issue (https://internals.rust-lang.org/t/rust-1-50-0-pre-release-testing/14012/4?u=dtolnay). Tested both with and without prebuilt LLVM. The check for dry_run is necessary in the non-prebuilt case because the llvm-config built by bootstrap won't exist yet.
Fix assosiated typo
Introduced in d3c4dbd, noticed only
after the fact, sorry. 😅
Signed-off-by: Daniel Egger <daniel@eggers-club.de>
Fix documentation not showing on localStorage error
Fixesrust-lang#81928
The [documentation for setItem](https://developer.mozilla.org/en-US/docs/Web/API/Storage/setItem) specifies:
> developers should make sure to always catch possible exceptions from setItem()
…r=Mark-Simulacrum
bootstrap: fix wrong docs installation path
This PR fixesrust-lang#81967, a regression introduced by rust-lang#80797. The commit has already been backported to stable 1.50.0.
r? ``````@Mark-Simulacrum``````
…estebank
Make suggestion of changing mutability of arguments broader
Fixrust-lang#81421
Previously rustc tries to emit the suggestion of changing mutablity unless `!trait_ref.has_infer_types_or_consts() && self.predicate_can_apply(obligation.param_env, trait_ref)` and this led to some false negatives to occur.
…n-e0542-e0546, r=GuillaumeGomez
Improve long explanation for E0542 and E0546
Helps with rust-lang#61137
To keep the consistency with: rust-lang#81925
…=Mark-Simulacrum
dist: include src/build_helper as part of the crate graph for rustc-dev
The build_helper dependency is used to build the compiler/rustc_llvm build script.
Since it was missing, it wasn't possible to really use rustc-dev to
build, see for instance: rust-lang/rust-analyzer#7589.
… r=jyn514
clean up clean::Static struct
Having a `String` for the expression didn't make much sense, and even less when it's actually not used (except in json so I kept it).
r? ``@jyn514``
…ax-heller
Fix private intra-doc warnings on associated items
The issue was that the `kind, id` override was previously only being
considered for the disambiguator check, not the privacy check. This uses
the same ID for both.
Fixesrust-lang#81981.
r? ``@max-heller``
…jyn514
Tell user how to fix CI file being not up to date
This hopefully should avoid future questions like in rust-lang#79979 (comment).
@rustbotrustbot added the rollup A PR which is a rollup label Feb 12, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=16 rollup=never

@bors

bors commented Feb 12, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit ff8b7f2 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 12, 2021
@bors

bors commented Feb 12, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ff8b7f2 with merge d416093...

@bors

bors commented Feb 12, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing d416093 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 12, 2021
@bors
bors merged commit d416093 into rust-lang:masterFeb 12, 2021
@rustbotrustbot added this to the 1.52.0 milestone Feb 12, 2021
@JohnTitor
JohnTitor deleted the rollup-cohp0gy branch February 12, 2021 17:42
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

19 participants

@JohnTitor@bors@rustbot@petar-dambovaliev@LeSeulArtichaut@camsteffen@joshtriplett@dtolnay@therealprof@lovasoa@emilyalbini@hkmatsumoto@jesusprubio@bnjbvr@ojeda@GuillaumeGomez@jyn514@Mark-Simulacrum@eltociear