Rename rustc_errors dependency in rust 2018 crates#58273
Rename rustc_errors dependency in rust 2018 crates#58273bors merged 3 commits intorust-lang:masterfrom
Conversation
src/librustc/ty/query/plumbing.rs
Outdated
There was a problem hiding this comment.
Can these be moved down to the other external dependencies?
|
☔ The latest upstream changes (presumably #57617) made this pull request unmergeable. Please resolve the merge conflicts. |
e44c252 to
7abba33
Compare
|
☔ The latest upstream changes (presumably #57770) made this pull request unmergeable. Please resolve the merge conflicts. |
7abba33 to
e419806
Compare
|
The job Click to expand the log.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 |
FWIW, you don't need |
|
@bors r+ |
|
📌 Commit 8bb7f5f21c5cf3877ea9b9404b3ba400f113c116 has been approved by |
Yeah, we originally used |
|
☔ The latest upstream changes (presumably #58151) made this pull request unmergeable. Please resolve the merge conflicts. |
8bb7f5f to
485d888
Compare
|
Rebased. |
|
☔ The latest upstream changes (presumably #58098) made this pull request unmergeable. Please resolve the merge conflicts. |
485d888 to
c08b5ca
Compare
|
Rebased. |
|
@bors r+ |
|
📌 Commit c08b5ca has been approved by |
…wjasper Rename rustc_errors dependency in rust 2018 crates I think this is a better solution than `use rustc_errors as errors` in `lib.rs` and `use crate::errors` in modules. Related: rust-lang/cargo#5653 cc rust-lang#58099 r? @Centril
…wjasper Rename rustc_errors dependency in rust 2018 crates I think this is a better solution than `use rustc_errors as errors` in `lib.rs` and `use crate::errors` in modules. Related: rust-lang/cargo#5653 cc rust-lang#58099 r? @Centril
Rollup of 13 pull requests Successful merges: - #57693 (Doc rewording) - #57815 (Speed up the fast path for assert_eq! and assert_ne!) - #58034 (Stabilize the time_checked_add feature) - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO)) - #58137 (Cleanup: rename node_id_to_type(_opt)) - #58166 (allow shorthand syntax for deprecation reason) - #58196 (Add specific feature gate error for const-unstable features) - #58200 (fix str mutating through a ptr derived from &self) - #58273 (Rename rustc_errors dependency in rust 2018 crates) - #58289 (impl iter() for dyn Error) - #58387 (Disallow `auto` trait alias syntax) - #58404 (use Ubuntu keyserver for CloudABI ports) - #58405 (Remove some dead code from libcore) Failed merges: r? @ghost
…wjasper Rename rustc_errors dependency in rust 2018 crates I think this is a better solution than `use rustc_errors as errors` in `lib.rs` and `use crate::errors` in modules. Related: rust-lang/cargo#5653 cc rust-lang#58099 r? @Centril
Rollup of 12 pull requests Successful merges: - #57693 (Doc rewording) - #57815 (Speed up the fast path for assert_eq! and assert_ne!) - #58034 (Stabilize the time_checked_add feature) - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO)) - #58137 (Cleanup: rename node_id_to_type(_opt)) - #58166 (allow shorthand syntax for deprecation reason) - #58200 (fix str mutating through a ptr derived from &self) - #58273 (Rename rustc_errors dependency in rust 2018 crates) - #58289 (impl iter() for dyn Error) - #58387 (Disallow `auto` trait alias syntax) - #58404 (use Ubuntu keyserver for CloudABI ports) - #58405 (Remove some dead code from libcore) Failed merges: r? @ghost
I think this is a better solution than
use rustc_errors as errorsinlib.rsanduse crate::errorsin modules.Related: rust-lang/cargo#5653
cc #58099
r? @Centril