diff options
| author | bors <bors@rust-lang.org> | 2020-04-01 20:30:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-01 20:30:35 +0000 |
| commit | 76b11980ad416c3ad6143504c2277757ecacf9b5 (patch) | |
| tree | 09ff9388a0a0a757eed3e6f73b646ed784241816 /src/librustc_error_codes/error_codes | |
| parent | 235938d1acdd93d6641a741c81f64e415b786751 (diff) | |
| parent | 7d4d450da96677cb6b8f90af13ada38c74f73632 (diff) | |
Auto merge of #70672 - Dylan-DPC:rollup-cco9bbd, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #70535 (Track the finalizing node in the specialization graph) - #70590 (Miri: make backtrace function names and spans match up) - #70616 (rustc_target::abi: rename FieldPlacement to FieldsShape.) - #70626 (cargotest: remove webrender) - #70649 (clean up E0468 explanation) - #70662 (compiletest: don't use `std::io::stdout()`, as it bypasses `set_print`.) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0468.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_error_codes/error_codes/E0468.md b/src/librustc_error_codes/error_codes/E0468.md index 73e3ebb949a..cf8664718fa 100644 --- a/src/librustc_error_codes/error_codes/E0468.md +++ b/src/librustc_error_codes/error_codes/E0468.md @@ -1,4 +1,4 @@ -A non-root module attempts to import macros from another crate. +A non-root module tried to import macros from another crate. Example of erroneous code: @@ -17,7 +17,7 @@ Either move the macro import to crate root or do without the foreign macros. This will work: ``` -#[macro_use(debug_assert)] +#[macro_use(debug_assert)] // ok! extern crate core; mod foo { |