Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7ae0618

Browse files
authoredJan 10, 2020
Rollup merge of #68050 - Centril:canon-error, r=Mark-Simulacrum
Canonicalize rustc_error imports r? @Mark-Simulacrum
2 parents 93f0ba9 + 8bd3d24 commit 7ae0618

File tree

138 files changed

+242
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+242
-276
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3654,6 +3654,7 @@ dependencies = [
36543654
"log",
36553655
"rustc",
36563656
"rustc_data_structures",
3657+
"rustc_errors",
36573658
"rustc_feature",
36583659
"rustc_hir",
36593660
"rustc_index",

‎src/librustc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ rustc_hir = { path = "../librustc_hir" }
2626
rustc_target = { path = "../librustc_target" }
2727
rustc_macros = { path = "../librustc_macros" }
2828
rustc_data_structures = { path = "../librustc_data_structures" }
29+
rustc_errors = { path = "../librustc_errors" }
2930
rustc_index = { path = "../librustc_index" }
30-
errors = { path = "../librustc_errors", package = "rustc_errors" }
3131
rustc_serialize = { path = "../libserialize", package = "serialize" }
3232
syntax = { path = "../libsyntax" }
3333
rustc_span = { path = "../librustc_span" }

0 commit comments

Comments
 (0)