Skip to content

Conversation

wesleywiser
Copy link
Member

This is a cutdown version of #96784 which doesn't include the apfloat changes. At this point, the other 3 commits in this PR don't seem to be controversial and I'd like to go ahead and get those merged which will leave #96784 with only the more complex apfloat related change.

r? @Mark-Simulacrum since you are the reviewer on that PR

cc @joshtriplett since you also had feedback in that PR

The compiler-rt dependency was removed in
7e6c9f3 in favor of a vendored
dependency on rust-lang/compiler-builtins (dual UIUC and MIT licensed).
That vendored dependency was converted to a regular Cargo dependency in
4c21a3b.
Use of libbacktrace was removed in
06d565c where we switched to using the
gimili library instead. Note: the backtrace submodule located at
library/backtrace points to backtrace-rs which removed support for using
libbacktrace in rust-lang/backtrace-rs#423.
LLVM has relicensed their codebase. Remove the old UIUC license text
from the LLVM section and include the licensing text used by LLVM
itself.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 23, 2022
@joshtriplett
Copy link
Member

LGTM.

@Mark-Simulacrum
Copy link
Member

@bors r=Mark-Simulacrum,joshtriplett rollup

Definitely seems like a good start, even though there's probably a good way to go still :)

@bors
Copy link
Collaborator

bors commented Oct 1, 2022

📌 Commit 99adba6 has been approved by Mark-Simulacrum,joshtriplett

It is now in the queue for this repository.

@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 Oct 1, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#102195 (Improve the COPYRIGHT file)
 - rust-lang#102313 (Update docs so that deprecated method points to relevant method)
 - rust-lang#102353 (Allow passing rustix_use_libc cfg using RUSTFLAGS)
 - rust-lang#102405 (Remove a FIXME whose code got moved away in rust-lang#62883.)
 - rust-lang#102525 (rustdoc: remove orphaned link on array bracket)
 - rust-lang#102557 (fix issue with x.py setup running into explicit panic)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e8e3c5c into rust-lang:master Oct 2, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

6 participants