Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare proc_macro for decoupling it from the rest of the compiler. #52552

Merged
merged 6 commits into from
Jul 21, 2018
Merged

Prepare proc_macro for decoupling it from the rest of the compiler. #52552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0adb05
proc_macro: don't use DiagnosticBuilder for building up Diagnostics.
eddyb Apr 21, 2018
d10d0b3
proc_macro: don't try to reflect literals in quasi-quoting.
eddyb Apr 21, 2018
56aaa53
proc_macro: clean up the implementation of quasi-quoting.
eddyb Apr 22, 2018
e5e29d1
proc_macro: don't expose compiler-internal FileName in public API.
eddyb Mar 16, 2018
bc2b21c
proc_macro: move some implementation details to a rustc module.
eddyb Jul 19, 2018
99eac01
proc_macro: avoid exposing internal details in formatting impls.
eddyb Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 14 additions & 30 deletions src/libproc_macro/diagnostic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

use Span;

use rustc_errors as rustc;
use rustc_errors as errors;
use syntax_pos::MultiSpan;

/// An enum representing a diagnostic level.
#[unstable(feature = "proc_macro_diagnostic", issue = "38356")]
Expand Down Expand Up @@ -97,38 +98,21 @@ impl Diagnostic {
/// Emit the diagnostic.
#[unstable(feature = "proc_macro_diagnostic", issue = "38356")]
pub fn emit(self) {
::__internal::with_sess(move |sess, _| {
let handler = &sess.span_diagnostic;
let level = __internal::level_to_internal_level(self.level);
let mut diag = rustc::DiagnosticBuilder::new(handler, level, &*self.message);
let level = self.level.to_internal();
let mut diag = errors::Diagnostic::new(level, &*self.message);

if let Some(span) = self.span {
diag.set_span(span.0);
}
if let Some(span) = self.span {
diag.set_span(span.0);
}

for child in self.children {
let span = child.span.map(|s| s.0);
let level = __internal::level_to_internal_level(child.level);
diag.sub(level, &*child.message, span);
}
for child in self.children {
let span = child.span.map_or(MultiSpan::new(), |s| s.0.into());
let level = child.level.to_internal();
diag.sub(level, &*child.message, span, None);
}

diag.emit();
::__internal::with_sess(move |sess, _| {
errors::DiagnosticBuilder::new_diagnostic(&sess.span_diagnostic, diag).emit();
});
}
}

#[unstable(feature = "proc_macro_internals", issue = "27812")]
#[doc(hidden)]
pub mod __internal {
use super::{Level, rustc};

pub fn level_to_internal_level(level: Level) -> rustc::Level {
match level {
Level::Error => rustc::Level::Error,
Level::Warning => rustc::Level::Warning,
Level::Note => rustc::Level::Note,
Level::Help => rustc::Level::Help,
Level::__Nonexhaustive => unreachable!("Level::__Nonexhaustive")
}
}
}
Loading