Skip to content

Rollup of 12 pull requests - #72187

Merged
bors merged 38 commits into
rust-lang:masterfrom
RalfJung:rollup-a7a9jdi
May 14, 2020
Merged

Rollup of 12 pull requests#72187
bors merged 38 commits into
rust-lang:masterfrom
RalfJung:rollup-a7a9jdi

Conversation

@RalfJung

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

ldm0and others added 30 commits April 25, 2020 08:56
This attempts to be a little clearer (including in terminology) about the lack
of guarantees that any::type_name provides.
Co-authored-by: Timo <timorcb@gmail.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
`prefix` should not be mutable.
Change the process from for loop to find, which makes the `prefix` able to be immutable.
… r=kennytm
Be slightly more precise about any::type_name()'s guarantees.
The first commit in this PR rephrases the current documentation for `any::type_name()` to be a little more specific about the guarantees (or lack thereof) that this function makes. The second commit explicitly documents that lifetimes are currently not included in the output (since this bit me particularly hard recently).
… r=steveklabnik
Document From trait for Option implementations
Add documentation for ```From``` trait for ```std::option::Option``` implementations
This PR solves a part of rust-lang#51430 ( CC @skade )
This is my first PR ever in contributing for OSS. I'm happy to learn and make any changes if necessary :)
…dows, r=Mark-Simulacrum
Fix bootstrap failing on win32
```powershell
python x.py -h # or really any x.py command
```
would fail with
```
info: Downloading and building bootstrap before processing --help
command. See src/bootstrap/README.md for help with common
commands.
Updating only changed submodules
Submodules updated in 0.15 seconds
Traceback (most recent call last):
File "x.py", line 11, in <module>
bootstrap.main()
File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 960, in main
bootstrap(help_triggered)
File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 925, in bootstrap
build.build = args.build or build.build_triple()
File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 731, in build_triple
return default_build_triple()
File "C:\Users\Joshua\Projects\forks\rust\src\bootstrap\bootstrap.py", line 184, in default_build_triple
ostype = require(["uname", "-s"], exit=required).decode(default_encoding)
AttributeError: 'NoneType' object has no attribute 'decode'
```
This PR defers the `decode` call until after we're sure `ostype` and `cputype` are not `None`, as they would be on Windows since `uname` doesn't exist
…hewjasper
Add doc comment for `rustc_middle::mir::mono::Linkage`
…atsakis
Remove UnnormalizedProjection
This was only used for the old chalk integration with chalk-engine
r? @nikomatsakis
Update books
## book
2 commits in e37c0e84e2ef73d3a4ebffda8011db6814a3b02d..6247be15a7f7509559f7981ee2209b9e0cc121df
2020-04-26 09:31:36 -0500 to 2020-05-03 10:55:09 -0500
- Fix guessing game listing explanation (rust-lang/book#2321)
- Update ch01-01-installation.md (rust-lang/book#2325)
## edition-guide
1 commits in 8204c1d123472cd17f0c1c5c77300ae802eb0271..49270740c7a4bff2763e6bc730b191d45b7d5167
2020-04-09 18:55:50 -0700 to 2020-05-11 08:50:29 -0500
- Use rust-lang/rust linkchecker on CI. (rust-lang/edition-guide#197)
## embedded-book
1 commits in 40beccdf1bb8eb9184a2e3b42db8b8c6e394247f..366c50a03bed928589771eba8a6f18e0c0c01d23
2020-04-26 17:44:14 +0000 to 2020-05-07 09:04:42 +0000
- Add HAL patterns/guidelines/recommendations (rust-embedded/book#235)
## nomicon
3 commits in 4d2d275997746d35eabfc4d992dfbdcce2f626ed..d1517d4e3f29264c5c67bce2658516bb5202c800
2020-04-27 10:24:52 -0400 to 2020-05-12 13:47:00 -0400
- Rename Unique::empty to Unique::dangling
- Use simpler link syntax
- Replace catch_panic by catch_unwind
## reference
3 commits in ed22e6fbfcb6ce436e9ea3b4bb4a55b2fb50a57e..892b928b565e35d25b6f9c47faee03b94bc41489
2020-04-24 12:46:22 -0700 to 2020-05-11 11:13:51 -0700
- clarify that str data must still be initialized
- remove language-level UB for non-UTF-8 str
- Replace incorrect term "parent modules" with "ancestor modules". (rust-lang/reference#806)
## rust-by-example
2 commits in ffc99581689fe2455908aaef5f5cf50dd03bb8f5..ab072b14393cbd9e8a1d1d75879bf51e27217bbb
2020-04-24 15:05:04 -0300 to 2020-05-09 08:46:39 -0300
- Fix link of formatting traits (rust-lang/rust-by-example#1346)
- Remove stale footnote (rust-lang/rust-by-example#1345)
…wjasper
docs: remove comment referencing non-existent method
…imulacrum
Fix Arc::decr_strong_count doc test
@RalfJung

Copy link
Copy Markdown
MemberAuthor

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

@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 56986be has been approved by RalfJung

@rustbotrustbot added the rollup A PR which is a rollup label May 14, 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 May 14, 2020
@RalfJungRalfJung mentioned this pull request May 14, 2020
@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 56986be with merge 5d20939d74cca6fe7643d68ddb32a8a35efc9a1b...

@bors

bors commented May 14, 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 May 14, 2020
@RalfJung

Copy link
Copy Markdown
MemberAuthor

Just a randomly failing "upload artifacts to S3" on macOS, no error message.

@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 May 14, 2020
@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 56986be with merge af6d886...

@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 14, 2020
@bors
bors merged commit af6d886 into rust-lang:masterMay 14, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #72187!

Tested on commit af6d886.
Direct link to PR: #72187

🎉 nomicon on windows: test-fail → test-pass (cc @Gankra@frewsxcv).
🎉 nomicon on linux: test-fail → test-pass (cc @Gankra@frewsxcv).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 14, 2020
Tested on commit rust-lang/rust@af6d886.
Direct link to PR: <rust-lang/rust#72187>
🎉 nomicon on windows: test-fail → test-pass (cc @Gankra@frewsxcv).
🎉 nomicon on linux: test-fail → test-pass (cc @Gankra@frewsxcv).
@RalfJung
RalfJung deleted the rollup-a7a9jdi branch May 14, 2020 16:38
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.

14 participants

@RalfJung@bors@rust-highfive@rustbot@ldm0@ltratt@Dolpheyn@jackh726@GuillaumeGomez@wesleywiser@jcotton42@ehuss@tshepang@tmiasko