Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clear out std, not std tools #68500

Merged
merged 1 commit into from
Jan 24, 2020
Merged

Clear out std, not std tools #68500

merged 1 commit into from
Jan 24, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jan 24, 2020 •
edited
Loading

This was a typo that slipped in, and meant that we were still not properly
clearing out std.

This is basically #67760 but actually correct...

@Mark-Simulacrum
Clear out std, not std tools
1cbb5d8 
This was a typo that slipped in, and meant that we were still not properly
clearing out std.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 24, 2020
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 24, 2020

📌 Commit 1cbb5d8 has been approved by alexcrichton

@bors bors 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 Jan 24, 2020
tmandry added a commit to tmandry/rust that referenced this pull request Jan 24, 2020
@tmandry
Rollup merge of rust-lang#68500 - Mark-Simulacrum:fix-bootstrap-clear…
ac737d6 
…ing, r=alexcrichton

Clear out std, not std tools

This was a typo that slipped in, and meant that we were still not properly
clearing out std.

This is basically rust-lang#67760 but actually correct...
@tmandry tmandry mentioned this pull request Jan 24, 2020
Closed
@rust-highfive
Copy link
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. 
2020-01-24T01:52:32.1959341Z ========================== Starting Command Output ===========================
2020-01-24T01:52:32.1963673Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/9bebaeac-65bc-447e-91ac-78df9d88da1f.sh
2020-01-24T01:52:32.1963962Z 
2020-01-24T01:52:32.1969914Z ##[section]Finishing: Disable git automatic line ending conversion
2020-01-24T01:52:32.1977350Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68500/merge to s
2020-01-24T01:52:32.1979423Z Task         : Get sources
2020-01-24T01:52:32.1979461Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-01-24T01:52:32.1979497Z Version      : 1.0.0
2020-01-24T01:52:32.1979534Z Author       : Microsoft
---
2020-01-24T01:52:33.2504418Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-24T01:52:33.2518578Z ##[command]git config gc.auto 0
2020-01-24T01:52:33.2520927Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-24T01:52:33.2522916Z ##[command]git config --get-all http.proxy
2020-01-24T01:52:33.2529817Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/68500/merge:refs/remotes/pull/68500/merge

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 @TimNN. (Feature Requests)

tmandry added a commit to tmandry/rust that referenced this pull request Jan 24, 2020
@tmandry
Rollup merge of rust-lang#68500 - Mark-Simulacrum:fix-bootstrap-clear…
7f8a61d 
…ing, r=alexcrichton

Clear out std, not std tools

This was a typo that slipped in, and meant that we were still not properly
clearing out std.

This is basically rust-lang#67760 but actually correct...
@tmandry tmandry mentioned this pull request Jan 24, 2020
Merged
bors added a commit that referenced this pull request Jan 24, 2020
@bors
Auto merge of #68506 - tmandry:rollup-kz9d33v, r=tmandry
dee12bb 
Rollup of 7 pull requests

Successful merges:

 - #68424 (Suggest borrowing `Vec<NonCopy>` in for loop)
 - #68438 (Account for non-types in substs for opaque type error messages)
 - #68469 (Avoid overflow in `std::iter::Skip::count`)
 - #68473 (Enable ASan on Fuchsia)
 - #68479 (Implement `unused_parens` for block return values)
 - #68483 (Add my (@flip1995) name to .mailmap)
 - #68500 (Clear out std, not std tools)

Failed merges:

r? @ghost
@Mark-Simulacrum
Copy link
Member Author

mingw-check appears to have spuriously failed due to network error

@bors bors merged commit 1cbb5d8 into rust-lang:master Jan 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Mark-Simulacrum @alexcrichton @bors @rust-highfive