Skip to content

Rollup of 12 pull requests - #76186

Merged
bors merged 29 commits into
rust-lang:masterfrom
tmandry:rollup-49nliiy
Sep 1, 2020
Merged

Rollup of 12 pull requests#76186
bors merged 29 commits into
rust-lang:masterfrom
tmandry:rollup-49nliiy

Conversation

@tmandry

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

pickfireand others added 29 commits August 30, 2020 11:16
vars() rather than vars function
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Use [xxx()] rather than the [xxx] function
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Env text representation of function intra-doc link
Suggested by @jyn514
Link join_paths in env doc for parity
Change xxx to env::xxx for lib env doc
Add link requsted by @jyn514
Fix doc build with same link
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Fix missing intra-doc link
Fix added whitespace in doc
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Add brackets for `join_paths`
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Use unused link join_paths
Removed same link for join_paths
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Remove unsed link join_paths
Constify the following methods of `alloc::borrow::Cow`:
- `is_borrowed`
- `is_owned`
These methods are still unstable under `cow_is_borrowed`.
Possible because of rust-lang#49146 (Allow if and match in constants).
Tracking issue: rust-lang#65143
Fixrust-lang#19599
This confuse people, no trust or not rust?
Or not rust no trust? Only trust rust ^^
`parse_stream_from_source_str` is a more stable API to convert a
string into a bunch of tokens, and it also catches errors about
mismatched parenthesis.
After the recent refactorings, we can actually completely hide this
type. It should help with rust-lang#63689.
This was approved by me prematurely. It needs T-libs approval.
The only change is that `expect_file` now uses path relative to the
current file (same as `include!`). Before, it used paths relative to
the workspace root, which makes no sense.
Similar to the tests for Option and Result.
Found that -C link-dead-code (which was enabled automatically
under -Z instrument-coverage) was causing the linking error that
resulted in segmentation faults in coverage instrumented binaries. Link
dead code is now disabled under MSVC, allowing `-Z instrument-coverage`
to be enabled under MSVC for the first time.
More details are included in Issue rust-lang#76038.
(This PR was broken out from PR rust-lang#75828)
`span.is_empty()` - returns true if `lo()` and `hi()` are equal. This is
not only a convenience, but makes it clear that a `Span` can be empty
(that is, retrieving the source for an empty `Span` will return an empty
string), and codifies the (otherwise undocumented--in the rustc_span
package, at least) fact that `Span` is a half-open interval (where
`hi()` is the open end).
`source_map.lookup_file_span()` - returns an enclosing `Span`
representing the start and end positions of the file enclosing the given
`BytePos`. This gives developers a clear way to quickly determine if any
any other `BytePos` or `Span` is also from the same file (for example,
by simply calling `file_span.contains(span)`).
This results in much simpler code and is much more runtime efficient
compared with the obvious alternative: calling `source_map.lookup_line()`
for any two `Span`'s byte positions, handle both arms of the `Result`
(both contain the file), and then compare files. It is also more
efficient than the non-public method `lookup_source_file_idx()` for each
`BytePos`, because, while comparing the internal source file indexes
would be efficient, looking up the source file index for every `BytePos`
or `Span` to be compared requires a binary search (worst case
performance being O(log n) for every lookup).
`source_map.lookup_file_span()` performs the binary search only once, to
get the `file_span` result that can be used to compare to any number of
other `BytePos` or `Span` values and those comparisons are always O(1).
Use `env::func()`, not 'the function env::func' in docs for std::env
Follow up of rust-lang#75629
r? @jyn514
…3, r=tmandry
Fix `-Z instrument-coverage` on MSVC
Found that `-C link-dead-code` (which was enabled automatically
under `-Z instrument-coverage`) was causing the linking error that
resulted in segmentation faults in coverage instrumented binaries. Link
dead code is now disabled under MSVC, allowing `-Z instrument-coverage`
to be enabled under MSVC for the first time.
More details are included in Issue rust-lang#76038 .
Note this PR makes it possible to support `Z instrument-coverage` but
does not enable instrument coverage for MSVC in existing tests. It will be
enabled in another PR to follow this one (both PRs coming from original
PR rust-lang#75828).
r? @tmandry
FYI: @wesleywiser
…4, r=wesleywiser
Adds two source span utility functions used in source-based coverage
`span.is_empty()` - returns true if `lo()` and `hi()` are equal. This is
not only a convenience, but makes it clear that a `Span` can be empty
(that is, retrieving the source for an empty `Span` will return an empty
string), and codifies the (otherwise undocumented--in the rustc_span
package, at least) fact that `Span` is a half-open interval (where
`hi()` is the open end).
`source_map.lookup_file_span()` - returns an enclosing `Span`
representing the start and end positions of the file enclosing the given
`BytePos`. This gives developers a clear way to quickly determine if any
any other `BytePos` or `Span` is also from the same file (for example,
by simply calling `file_span.contains(span)`).
This results in much simpler code and is much more runtime efficient
compared with the obvious alternative: calling `source_map.lookup_line()`
for any two `Span`'s byte positions, handle both arms of the `Result`
(both contain the file), and then compare files. It is also more
efficient than the non-public method `lookup_source_file_idx()` for each
`BytePos`, because, while comparing the internal source file indexes
would be efficient, looking up the source file index for every `BytePos`
or `Span` to be compared requires a binary search (worst case
performance being O(log n) for every lookup).
`source_map.lookup_file_span()` performs the binary search only once, to
get the `file_span` result that can be used to compare to any number of
other `BytePos` or `Span` values and those comparisons are always O(1).
This PR was split out from PR rust-lang#75828 .
r? @tmandry
FYI: @wesleywiser
…morse
Make `cow_is_borrowed` methods const
Constify the following methods of `alloc::borrow::Cow`:
- `is_borrowed`
- `is_owned`
Analogous to the const methods `is_some` and `is_none` for Option, and `is_ok` and `is_err` for Result.
These methods are still unstable under `cow_is_borrowed`.
Possible because of rust-lang#49146 (Allow if and match in constants).
Tracking issue: rust-lang#65143
…n514
Fix rustdoc strings indentation
I took the opportunity to clean up our strings indentation a bit because it was a bit messy.
r? @jyn514
Remove notrust in rustc_middle
Fixrust-lang#19599
This confuse people, no trust or not rust?
Or not rust no trust? Only trust rust ^^
Superseeds rust-lang#76063
r? @matklad
README: Adjust Linux and macOS support platform and architecture
cc rust-lang#74163
…Jung
Revert rust-lang#75463
This was approved by me prematurely. It needs T-libs approval. Sorry @CDirkx.
r? @RalfJung
Update expect-test to 1.0
The only change is that `expect_file` now uses path relative to the
current file (same as `include!`). Before, it used paths relative to
the workspace root, which makes no sense.
@tmandry

Copy link
Copy Markdown
MemberAuthor

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

@bors

bors commented Sep 1, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 8d328d7 has been approved by tmandry

@rustbotrustbot added the rollup A PR which is a rollup label Sep 1, 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 Sep 1, 2020
@bors

bors commented Sep 1, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8d328d7 with merge 6f6a972a5dffea7f4612cddc32108e7d96c0e7e3...

@bors

bors commented Sep 1, 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 Sep 1, 2020
@tmandry

tmandry commented Sep 1, 2020

Copy link
Copy Markdown
MemberAuthor

Looks spurious:

error: linking with `link.exe` failed: exit code: 1102
|
= note: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Tools\\MSVC\\14.27.29110\\bin\\HostX64\\x86\\link.exe" "/NOLOGO" "/NXCOMPAT" "/LARGEADDRESSAWARE" "/SAFESEH" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\consts\\const-int-pow-rpass\\a.const_int_pow_rpass.7rcbfp3g-cgu.0.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\consts\\const-int-pow-rpass\\a.const_int_pow_rpass.7rcbfp3g-cgu.1.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\consts\\const-int-pow-rpass\\a.const_int_pow_rpass.7rcbfp3g-cgu.2.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\consts\\const-int-pow-rpass\\a.const_int_pow_rpass.7rcbfp3g-cgu.3.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\consts\\const-int-pow-rpass\\a.const_int_pow_rpass.7rcbfp3g-cgu.4.rcgu.o" "/OUT:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\consts\\const-int-pow-rpass\\a.exe" "/OPT:REF,ICF" "/DEBUG" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui\\consts\\const-int-pow-rpass\\auxiliary" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "std-80730a5ad2dba052.dll.lib" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libcompiler_builtins-26e7ff82cb34ea94.rlib" "advapi32.lib" "ws2_32.lib" "userenv.lib" "msvcrt.lib"
= note: LINK : fatal error LNK1102: out of memory
error: aborting due to previous error
------------------------------------------
failures:
[ui] ui\consts\const-int-pow-rpass.rs

@bors retry

@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 Sep 1, 2020
@bors

bors commented Sep 1, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8d328d7 with merge 795cefaa9965b00cdf326fd8a816ae367425d555...

@bors

bors commented Sep 1, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8d328d7 with merge 445f34b...

@tmandrytmandry added the A-spurious Area: Spurious failures in builds (spuriously == for no apparent reason) label Sep 1, 2020
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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.
##[group]Run exit 1
exit 1
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
##[endgroup]
##[error]Process completed with exit code 1.

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 Sep 1, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: tmandry
Pushing 445f34b to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 1, 2020
@bors
bors merged commit 445f34b into rust-lang:masterSep 1, 2020
@tmandry
tmandry deleted the rollup-49nliiy branch September 1, 2020 23:21
@cuvipercuviper added this to the 1.48.0 milestone Nov 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-spuriousArea: Spurious failures in builds (spuriously == for no apparent reason)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.

10 participants

@tmandry@bors@rust-log-analyzer@cuviper@rustbot@pickfire@GuillaumeGomez@tesuji@matklad@ecstatic-morse