Skip to content

Remove some reexports in rustc_middle#70634

Merged
bors merged 5 commits into
rust-lang:masterfrom
Centril:import-directly
Apr 2, 2020
Merged

Remove some reexports in rustc_middle#70634
bors merged 5 commits into
rust-lang:masterfrom
Centril:import-directly

Conversation

@Centril

@Centril Centril commented Mar 31, 2020 •
edited by Mark-Simulacrum
Loading

Copy link
Copy Markdown
Contributor

This will help get these imports out of the way of detecting the true dependencies in and out to rustc_middle, thereby helping future work towards #65031.

@Mark-Simulacrum

Mark-Simulacrum commented Mar 31, 2020

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Mar 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 316c240 has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 31, 2020
@Centril

Centril commented Mar 31, 2020

Copy link
Copy Markdown
Contributor Author

CI says I forgot to fix some full-deps tests, will r=you once I'm done. =P

@bors r-

@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 Mar 31, 2020
@Centril

Centril commented Mar 31, 2020

Copy link
Copy Markdown
Contributor Author

...and done, @bors r=Mark-Simulacrum

@bors

bors commented Mar 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit d796b7a 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 Mar 31, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 31, 2020
@Dylan-DPC
Rollup merge of rust-lang#70634 - Centril:import-directly, r=Mark-Sim…
a176bd2 
…ulacrum

Remove some reexports in `rustc_middle`

This will help get these imports out of the way of detecting the true dependencies in and out to `rustc_middle`, thereby helping future work towards rust-lang#65031.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 31, 2020
Closed
@Centril

Centril commented Mar 31, 2020

Copy link
Copy Markdown
Contributor Author

Argh... another test... will r=you soon again, @bors r-

@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 Mar 31, 2020
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril

Centril commented Mar 31, 2020

Copy link
Copy Markdown
Contributor Author

@bors r=Mark-Simulacrum

@bors

bors commented Mar 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0e47c44825da09cf061f86683a17fd410907d871 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 Mar 31, 2020
@Centril Centril mentioned this pull request Apr 1, 2020
Closed
@Centril Centril mentioned this pull request Apr 1, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2020
@bors
Auto merge of rust-lang#70653 - Centril:rollup-vh5x5e5, r=Centril
235938d 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#70511 (Add `-Z dump-mir-dataflow` flag for dumping dataflow results visualization)
 - rust-lang#70522 (Improve error messages for raw strings (rust-lang#60762))
 - rust-lang#70547 (Add `can_unwind` field to `FnAbi`)
 - rust-lang#70591 (Ensure LLVM is in the link path for "fulldeps" tests)
 - rust-lang#70627 (Use place directly its copy)
 - rust-lang#70652 (Add git repo address to unstable book)

Failed merges:

 - rust-lang#70634 (Remove some reexports in `rustc_middle`)

r? @ghost
@Centril

Centril commented Apr 2, 2020

Copy link
Copy Markdown
Contributor Author

@bors r=Mark-Simulacrum

@bors

bors commented Apr 2, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0826009 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 Apr 2, 2020
@Centril Centril mentioned this pull request Apr 2, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2020
@bors
Auto merge of rust-lang#70692 - Centril:rollup-d0t4ecx, r=Centril
537ccdf 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#70281 (Implement Hash for Infallible)
 - rust-lang#70421 (parse: recover on `const fn()` / `async fn()`)
 - rust-lang#70615 (Renamed `PerDefTables` to `Tables`)
 - rust-lang#70631 (Update cargo)
 - rust-lang#70634 (Remove some reexports in `rustc_middle`)
 - rust-lang#70658 (add `STILL_FURTHER_SPECIALIZABLE` flag)
 - rust-lang#70678 (Add missing markdown rust annotation)
 - rust-lang#70681 (Handle unterminated raw strings with no #s properly)

Failed merges:

r? @ghost
@Centril Centril mentioned this pull request Apr 2, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Apr 2, 2020
@Centril
Rollup merge of rust-lang#70634 - Centril:import-directly, r=Mark-Sim…
f6a4a04 
…ulacrum

Remove some reexports in `rustc_middle`

This will help get these imports out of the way of detecting the true dependencies in and out to `rustc_middle`, thereby helping future work towards rust-lang#65031.
@bors bors merged commit 791e872 into rust-lang:master Apr 2, 2020
@Centril Centril deleted the import-directly branch April 2, 2020 19:04
bors pushed a commit to rust-lang/rust-clippy that referenced this pull request Apr 2, 2020
@flip1995
Rustup to rust-lang/rust#70634
98aa593
bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 2, 2020
@bors
Auto merge of #5407 - flip1995:rustup, r=matthiaskrgr
dd8ba12 
Rustup to rust-lang/rust#70634

r? @Manishearth

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 2, 2020
@bors
Auto merge of #5407 - flip1995:rustup, r=matthiaskrgr
4cdb023 
Rustup to rust-lang/rust#70634

r? @Manishearth

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 2, 2020
@bors
Auto merge of #5407 - flip1995:rustup, r=matthiaskrgr
0d6b71f 
Rustup to rust-lang/rust#70634

r? @Manishearth

changelog: none
@RalfJung RalfJung mentioned this pull request Apr 2, 2020
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 2, 2020
@bors
Auto merge of #5407 - flip1995:rustup, r=matthiaskrgr
b58954b 
Rustup to rust-lang/rust#70634

r? @Manishearth

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 3, 2020
@bors
Auto merge of #5407 - flip1995:rustup, r=matthiaskrgr
7cdccf4 
Rustup to rust-lang/rust#70634

r? @Manishearth

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 3, 2020
@bors
Auto merge of #5407 - flip1995:rustup, r=matthiaskrgr
5cf20c6 
Rustup to rust-lang/rust#70634

r? @Manishearth

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Apr 3, 2020
@bors
Auto merge of #5407 - flip1995:rustup, r=matthiaskrgr
ed5e827 
Rustup to rust-lang/rust#70634

r? @Manishearth

changelog: none
Manishearth added a commit to rust-lang/rust-clippy that referenced this pull request Apr 3, 2020
@Manishearth
Merge pull request #5407 from flip1995/rustup
7907abe 
Rustup to rust-lang/rust#70634
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 5, 2020
@matthiaskrgr
submodules: update clippy from 326b220 to 7907abe
04a38e7 
Changes:
````
Rustup to rust-lang#70634
Update clippy_lints/src/types.rs
Update types.rs
Update types.rs
Improve docs for option_option
useless Rc<Rc<T>>, Rc<Box<T>>, Rc<&T>, Box<&T>
Allow let_underscore
Update option_option ui test
Test for ignoring let_underscore_must_use
Downgrade option_option to pedantic
````

Fixes rust-lang#70709
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2020
@bors
Auto merge of rust-lang#70809 - matthiaskrgr:submodule_upd, r=Mark-Si…
6387b09 
…mulacrum

submodules: update clippy from 326b220 to 7907abe

Changes:
````
Rustup to rust-lang#70634
Update clippy_lints/src/types.rs
Update types.rs
Update types.rs
Improve docs for option_option
useless Rc<Rc<T>>, Rc<Box<T>>, Rc<&T>, Box<&T>
Allow let_underscore
Update option_option ui test
Test for ignoring let_underscore_must_use
Downgrade option_option to pedantic
````

Fixes rust-lang#70709
rokob pushed a commit to rokob/rust-clippy that referenced this pull request Apr 17, 2020
@flip1995 @rokob
Rustup to rust-lang/rust#70634
8440b0d
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
@matthiaskrgr
submodules: update clippy from 326b220 to 7907abe
d801044 
Changes:
````
Rustup to rust-lang/rust#70634
Update clippy_lints/src/types.rs
Update types.rs
Update types.rs
Improve docs for option_option
useless Rc<Rc<T>>, Rc<Box<T>>, Rc<&T>, Box<&T>
Allow let_underscore
Update option_option ui test
Test for ignoring let_underscore_must_use
Downgrade option_option to pedantic
````

Fixes #70709
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

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

@Centril @Mark-Simulacrum @bors @rust-highfive