Skip to content

Rollup of 9 pull requests - #74662

Merged
bors merged 31 commits into
rust-lang:masterfrom
Manishearth:rollup-jdt7t71
Jul 23, 2020
Merged

Rollup of 9 pull requests#74662
bors merged 31 commits into
rust-lang:masterfrom
Manishearth:rollup-jdt7t71

Conversation

@Manishearth

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

ecstatic-morseand others added 30 commits July 19, 2020 12:10
This is a basic copy-paste-modify from the existing
x86_64-apple-darwin target.
This adds a dedicated branch for perf to use for CI, intended to allow perf to
enqueue builds without needing to use bors. bors is great, but bors requires an
open PR to work, and we want to invoke perf on closed PRs sometimes (in
particular, rollups).
Add a FIXME to build scripts in profiler_builtins
Change the logic such that linking from a public to a private item always
triggers intra_doc_link_resolution_failure. Previously, the warning was
not emitted when --document-private-items is passed.
Also don't rely anymore on the item's visibility, which would falsely trigger
the lint now that the check for --document-private-items is gone.
…links
The additional note helps explaining why the lint was triggered and that
--document-private-items directly influences the link resolution.
…time, r=nikomatsakis
Detect when `'static` obligation might come from an `impl`
Partly address rust-lang#71341.
…r=jonas-schievink
Advertise correct stable version for const control flow
rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
…-priv, r=jyn514
rustdoc: Always warn when linking from public to private items
Change the logic such that linking from a public to a private item always triggers `intra_doc_link_resolution_failure`.
Previously, the warning was not emitted when `--document-private-items` is passed.
This came up during the discussion in rust-lang#74147 (comment).
Guard against non-monomorphized type_id intrinsic call
This PR checks whether the type is sufficient monomorphized when calling type_id or type_name intrinsics. If the type is not sufficiently monomorphized, e.g. used in a pattern, the code will be rejected.
Fixesrust-lang#73976
…get, r=nagisa
Add the aarch64-apple-darwin target
This is a basic copy-paste-modify from the existing
x86_64-apple-darwin target.
…lbini
Enable perf try builder
This adds a dedicated branch for perf to use for CI, intended to allow perf to
enqueue builds without needing to use bors. bors is great, but bors requires an
open PR to work, and we want to invoke perf on closed PRs sometimes (in
particular, rollups).
…r=estebank
Do not ICE on assoc type with bad placeholder
Fixesrust-lang#74612
r? @estebank
rustc_target: Add a target spec option for disabling `--eh-frame-hdr`
Disable `--eh-frame-hdr` for targets that use an `ld`-like linker, but don't support that option.
Do it through a target spec option rather than through hard-coding in `linker.rs`.
The option is still enabled by default though.
cc rust-lang#73564Fixesrust-lang#73564 (comment)Fixesrust-lang#74625Fixesrust-embedded/msp430-rt#12
…ulacrum
build: Remove unnecessary `cargo:rerun-if-env-changed` annotations
... and a couple of related cleanups.
rustc and cargo now track the majority of env var dependencies automatically (rust-lang/cargo#8421), so the annotations are no longer necessary.
@Manishearth

Copy link
Copy Markdown
MemberAuthor

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@bors

bors commented Jul 22, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b32383c has been approved by Manishearth

@rustbotrustbot added the rollup A PR which is a rollup label Jul 22, 2020
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 22, 2020
@bors

bors commented Jul 23, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b32383c with merge f493e6a7836d811c71b6b6af1825c0d019967142...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
Build completed successfully in 0:01:47
+ /scripts/validate-toolstate.sh
Cloning into 'rust-toolstate'...
<Nothing changed>
Traceback (most recent call last):
File "../../src/tools/publish_toolstate.py", line 286, in <module>
validate_maintainers(repo, github_token)
File "../../src/tools/publish_toolstate.py", line 87, in validate_maintainers
'Accept': 'application/vnd.github.hellcat-preview+json',
File "/usr/lib/python3.6/urllib/request.py", line 223, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib/python3.6/urllib/request.py", line 532, in open
response = meth(req, response)
File "/usr/lib/python3.6/urllib/request.py", line 642, in http_response
'http', request, response, code, msg, hdrs)
File "/usr/lib/python3.6/urllib/request.py", line 570, in error
return self._call_chain(*args)
File "/usr/lib/python3.6/urllib/request.py", line 504, in _call_chain
result = func(*args)
File "/usr/lib/python3.6/urllib/request.py", line 650, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 403: Forbidden
local time: Thu Jul 23 00:34:07 UTC 2020
network time: Thu, 23 Jul 2020 00:34:07 GMT
== end clock drift check ==
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (12002) (node)
Terminate orphan process: pid (12030) (python)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@bors

bors commented Jul 23, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 23, 2020
@Manishearth

Copy link
Copy Markdown
MemberAuthor

@bors retry treeclosed=5

network

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 23, 2020
@bors

bors commented Jul 23, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b32383c with merge e8b55a4...

@bors

bors commented Jul 23, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: Manishearth
Pushing e8b55a4 to master...

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.

13 participants

@Manishearth@bors@rust-log-analyzer@cuviper@rustbot@ecstatic-morse@nbdd0121@shepmaster@JohnTitor@Mark-Simulacrum@petrochenkov@estebank@dennis-hamester