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

adjust remaining targets #74842

Merged
merged 1 commit into from
Aug 9, 2020
Merged

adjust remaining targets #74842

merged 1 commit into from
Aug 9, 2020

Conversation

stlankes
Copy link
Contributor

  • fix commit 7dc3886
  • previous commit doesn't adjust all targets

@rust-highfive
Copy link
Collaborator

r? @KodrAus

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 27, 2020
@KodrAus
Copy link
Contributor

KodrAus commented Jul 27, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 27, 2020

📌 Commit e58b390329a9690af4b378b4aaeca29ba04f1fd1 has been approved by KodrAus

@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 Jul 27, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

☔ The latest upstream changes (presumably #73265) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2020
@stlankes
adjust remaining targets
a4fb1d0 
- fix commit 7dc3886
- previous commit doesn't adjust all targets
@stlankes
Copy link
Contributor Author

I rebased the patch to the latest version of the master branch.

@stlankes
Copy link
Contributor Author

stlankes commented Jul 31, 2020 •
edited
Loading

Hello @KodrAus, can you review this PR? It would help me. Thanks!

@stlankes stlankes mentioned this pull request Aug 2, 2020
Closed
@stlankes
Copy link
Contributor Author

stlankes commented Aug 8, 2020

@Mark-Simulacrum can you help? Our pipelines are broken, if we not fix these typos.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 8, 2020

📌 Commit a4fb1d0 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 8, 2020
@JohnTitor JohnTitor mentioned this pull request Aug 8, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 8, 2020
@bors
Auto merge of rust-lang#75308 - JohnTitor:rollup-vnnny43, r=JohnTitor
dcf1077 
Rollup of 15 pull requests

Successful merges:

 - rust-lang#74712 (Update E0271 explanation)
 - rust-lang#74842 (adjust remaining targets)
 - rust-lang#75151 (Consistent variable name alloc for raw_vec)
 - rust-lang#75162 (Fix the documentation for move about Fn traits implementations)
 - rust-lang#75248 (Add `as_mut_ptr` to `NonNull<[T]>`)
 - rust-lang#75262 (Show multi extension example for Path in doctests)
 - rust-lang#75266 (Add safety section to `NonNull::as_*` method docs)
 - rust-lang#75284 (Show relative example for Path ancestors)
 - rust-lang#75285 (Separate example for Path strip_prefix)
 - rust-lang#75287 (Show Path extension example change multi extension)
 - rust-lang#75288 (Use assert! for Path exists example to check bool)
 - rust-lang#75289 (Remove ambiguity from PathBuf pop example)
 - rust-lang#75290 (fix `min_const_generics` version)
 - rust-lang#75291 (Clean up E0750)
 - rust-lang#75292 (Clean up E0502)

Failed merges:

r? @ghost
@bors bors merged commit dde4fb3 into rust-lang:master Aug 9, 2020
@mkroening mkroening deleted the thread_local branch December 11, 2022 19:09
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@KodrAus KodrAus

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
1.47.0
Development

Successfully merging this pull request may close these issues.
6 participants
@stlankes @rust-highfive @KodrAus @bors @Mark-Simulacrum @cuviper