mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
74240b22d9
rust/src/libsyntax/diagnostics/macros.rs

129 lines
3.9 KiB
Rust
Raw Normal View History

Add scaffolding for assigning alpha-numeric codes to rustc diagnostics
2014-07-01 11:39:41 -05:00
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#[macro_export]
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
macro_rules! register_diagnostic {
($code:tt, $description:tt) => (__register_diagnostic! { $code, $description });
($code:tt) => (__register_diagnostic! { $code })
}
Add scaffolding for assigning alpha-numeric codes to rustc diagnostics
2014-07-01 11:39:41 -05:00
Make fatal errors work with codes, add to typeck
2015-01-18 15:39:18 -06:00
#[macro_export]
macro_rules! span_fatal {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
__diagnostic_used!($code);
cleanup: replace `as[_mut]_slice()` calls with deref coercions
2015-02-01 20:53:25 -06:00
$session.span_fatal_with_code($span, &format!($($message)*), stringify!($code))
Make fatal errors work with codes, add to typeck
2015-01-18 15:39:18 -06:00
})
}
Add scaffolding for assigning alpha-numeric codes to rustc diagnostics
2014-07-01 11:39:41 -05:00
#[macro_export]
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
macro_rules! span_err {
Assign more diagnostic codes
2014-07-17 12:56:37 -05:00
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
Add scaffolding for assigning alpha-numeric codes to rustc diagnostics
2014-07-01 11:39:41 -05:00
__diagnostic_used!($code);
cleanup: replace `as[_mut]_slice()` calls with deref coercions
2015-02-01 20:53:25 -06:00
$session.span_err_with_code($span, &format!($($message)*), stringify!($code))
Add scaffolding for assigning alpha-numeric codes to rustc diagnostics
2014-07-01 11:39:41 -05:00
})
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
}
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
use structured errors
2015-12-20 15:00:43 -06:00
#[macro_export]
macro_rules! span_warn {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
__diagnostic_used!($code);
$session.span_warn_with_code($span, &format!($($message)*), stringify!($code))
})
}
Introduce a "origin/cause" for new requirements (or bugfixes...) introduced by RFC 1214, and issue a warning (and explanatory note) when we encounter such a thing.
2015-08-07 09:28:51 -05:00
#[macro_export]
macro_rules! span_err_or_warn {
($is_warning:expr, $session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
__diagnostic_used!($code);
if $is_warning {
$session.span_warn_with_code($span, &format!($($message)*), stringify!($code))
} else {
$session.span_err_with_code($span, &format!($($message)*), stringify!($code))
}
})
}
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
#[macro_export]
use structured errors
2015-12-20 15:00:43 -06:00
macro_rules! struct_span_fatal {
Assign more diagnostic codes
2014-07-17 12:56:37 -05:00
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
__diagnostic_used!($code);
use structured errors
2015-12-20 15:00:43 -06:00
$session.struct_span_fatal_with_code($span, &format!($($message)*), stringify!($code))
})
}
#[macro_export]
macro_rules! struct_span_err {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
__diagnostic_used!($code);
$session.struct_span_err_with_code($span, &format!($($message)*), stringify!($code))
})
}
#[macro_export]
macro_rules! struct_span_warn {
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
__diagnostic_used!($code);
$session.struct_span_warn_with_code($span, &format!($($message)*), stringify!($code))
})
}
#[macro_export]
macro_rules! struct_span_err_or_warn {
($is_warning:expr, $session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
__diagnostic_used!($code);
if $is_warning {
$session.struct_span_warn_with_code($span, &format!($($message)*), stringify!($code))
} else {
$session.struct_span_err_with_code($span, &format!($($message)*), stringify!($code))
}
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
})
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
}
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
#[macro_export]
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
macro_rules! span_note {
use structured errors
2015-12-20 15:00:43 -06:00
($err:expr, $span:expr, $($message:tt)*) => ({
($err).span_note($span, &format!($($message)*));
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
})
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
}
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
Diagnostic: resolve bare fn in expected closure Closes #15273 (I did not find how to get the identifier in the message :/) Also creates the span_help! macro associated with #18126
2014-10-28 18:59:36 -05:00
#[macro_export]
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
macro_rules! span_help {
use structured errors
2015-12-20 15:00:43 -06:00
($err:expr, $span:expr, $($message:tt)*) => ({
($err).span_help($span, &format!($($message)*));
Diagnostic: resolve bare fn in expected closure Closes #15273 (I did not find how to get the identifier in the message :/) Also creates the span_help! macro associated with #18126
2014-10-28 18:59:36 -05:00
})
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
}
Diagnostic: resolve bare fn in expected closure Closes #15273 (I did not find how to get the identifier in the message :/) Also creates the span_help! macro associated with #18126
2014-10-28 18:59:36 -05:00
Change span_help calls to fileline_help where appropriate
2015-02-24 08:07:54 -06:00
#[macro_export]
macro_rules! fileline_help {
use structured errors
2015-12-20 15:00:43 -06:00
($err:expr, $span:expr, $($message:tt)*) => ({
($err).fileline_help($span, &format!($($message)*));
Change span_help calls to fileline_help where appropriate
2015-02-24 08:07:54 -06:00
})
}
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
#[macro_export]
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
macro_rules! register_diagnostics {
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
($($code:tt),*) => (
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
$(register_diagnostic! { $code })*
Improve register_diagnostics macro
2015-07-16 06:16:59 -05:00
);
($($code:tt),*,) => (
$(register_diagnostic! { $code })*
Convert a first batch of diagnostics to have error codes
2014-07-11 11:54:01 -05:00
)
librustc: Always parse `macro!()`/`macro![]` as expressions if not followed by a semicolon. This allows code like `vec![1i, 2, 3].len();` to work. This breaks code that uses macros as statements without putting semicolons after them, such as: fn main() { ... assert!(a == b) assert!(c == d) println(...); } It also breaks code that uses macros as items without semicolons: local_data_key!(foo) fn main() { println("hello world") } Add semicolons to fix this code. Those two examples can be fixed as follows: fn main() { ... assert!(a == b); assert!(c == d); println(...); } local_data_key!(foo); fn main() { println("hello world") } RFC #378. Closes #18635. [breaking-change]
2014-11-14 11:18:10 -06:00
}
Add some extended errors.
2015-01-17 19:20:24 -06:00
#[macro_export]
macro_rules! register_long_diagnostics {
($($code:tt: $description:tt),*) => (
$(register_diagnostic! { $code, $description })*
Improve register_long_diagnostics macro
2015-07-17 04:21:05 -05:00
);
($($code:tt: $description:tt),*,) => (
$(register_diagnostic! { $code, $description })*
Add some extended errors.
2015-01-17 19:20:24 -06:00
)
}
Reference in New Issue Copy Permalink