Skip to content

build-manifest: re-add some comments - #64544

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:build-manifest
Sep 18, 2019
Merged

build-manifest: re-add some comments#64544
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:build-manifest

Conversation

@RalfJung

Copy link
Copy Markdown
Member

#64543 also reverted the comments I added. This adds them back.
Includes #64543.

r? @pietroalbini

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2019
@RalfJungRalfJung mentioned this pull request Sep 17, 2019
@RalfJung

Copy link
Copy Markdown
MemberAuthor

Rebased as #64543 landed.

@emilyalbini

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Sep 17, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit a4dc33b has been approved by pietroalbini

@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 17, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Sep 17, 2019
…bini
build-manifest: re-add some comments
rust-lang#64543 also reverted the comments I added. This adds them back.
Includes rust-lang#64543.
r? @pietroalbini
@tmandrytmandry mentioned this pull request Sep 17, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Sep 17, 2019
…bini
build-manifest: re-add some comments
rust-lang#64543 also reverted the comments I added. This adds them back.
Includes rust-lang#64543.
r? @pietroalbini
@tmandrytmandry mentioned this pull request Sep 17, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Sep 17, 2019
…bini
build-manifest: re-add some comments
rust-lang#64543 also reverted the comments I added. This adds them back.
Includes rust-lang#64543.
r? @pietroalbini
@tmandrytmandry mentioned this pull request Sep 17, 2019
bors added a commit that referenced this pull request Sep 17, 2019
Rollup of 10 pull requests
Successful merges:
- #61626 (Get rid of special const intrinsic query in favour of `const_eval`)
- #64283 (Updated RELEASES.md for 1.38.0)
- #64394 (Shrink `SubregionOrigin`.)
- #64429 (Fix failure note `to_str` implementation)
- #64436 (improve Vec example soundness in mem::transmute docs)
- #64502 (avoid duplicate issues for Miri build failures)
- #64505 (Fix inconsistent link formatting)
- #64529 (Add an example to Pin::as_mut)
- #64541 (document Miri error categories)
- #64544 (build-manifest: re-add some comments)
Failed merges:
r? @ghost
@bors
bors merged commit a4dc33b into rust-lang:masterSep 18, 2019
@RalfJung
RalfJung deleted the build-manifest branch September 19, 2019 06:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-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.

4 participants

@RalfJung@emilyalbini@bors@rust-highfive