mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-27 06:14:55 +00:00
Handle edge cases.
This commit introduces more dirty span manipulation into the compiler in order to handle the various edge cases in moving/renaming the macro import so it is at the root of the import.
This commit is contained in:
David Wood
parent
d589cf9111
commit
7c955409e3
@ -4,11 +4,11 @@ use errors::{Applicability, DiagnosticBuilder, DiagnosticId};
|
||||
use log::debug;
|
||||
use rustc::hir::def::{Def, CtorKind, Namespace::*};
|
||||
use rustc::hir::def_id::{CRATE_DEF_INDEX, DefId};
|
||||
use rustc::session::config::nightly_options;
|
||||
use rustc::session::{Session, config::nightly_options};
|
||||
use syntax::ast::{Expr, ExprKind, Ident};
|
||||
use syntax::ext::base::MacroKind;
|
||||
use syntax::symbol::keywords;
|
||||
use syntax_pos::Span;
|
||||
use syntax::symbol::{Symbol, keywords};
|
||||
use syntax_pos::{BytePos, Span};
|
||||
|
||||
use crate::macros::ParentScope;
|
||||
use crate::resolve_imports::{ImportDirective, ImportDirectiveSubclass, ImportResolver};
|
||||
@ -616,10 +616,84 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
|
||||
format!("{} as {}", source, target),
|
||||
_ => format!("{}", ident),
|
||||
};
|
||||
|
||||
// Assume this is the easy case of `use issue_59764::foo::makro;` and just remove
|
||||
// intermediate segments.
|
||||
let (mut span, mut correction) = (directive.span,
|
||||
format!("{}::{}", module_name, import));
|
||||
|
||||
if directive.is_nested() {
|
||||
span = directive.use_span;
|
||||
|
||||
// Find the binding span (and any trailing commas and spaces).
|
||||
// ie. `use a::b::{c, d, e};`
|
||||
// ^^^
|
||||
let (found_closing_brace, binding_span) = find_span_of_binding_until_next_binding(
|
||||
self.resolver.session, directive.span, directive.use_span,
|
||||
);
|
||||
debug!("check_for_module_export_macro: found_closing_brace={:?} binding_span={:?}",
|
||||
found_closing_brace, binding_span);
|
||||
|
||||
let mut removal_span = binding_span;
|
||||
if found_closing_brace {
|
||||
// If the binding span ended with a closing brace, as in the below example:
|
||||
// ie. `use a::b::{c, d};`
|
||||
// ^
|
||||
// Then expand the span of characters to remove to include the previous
|
||||
// binding's trailing comma.
|
||||
// ie. `use a::b::{c, d};`
|
||||
// ^^^
|
||||
if let Some(previous_span) = extend_span_to_previous_binding(
|
||||
self.resolver.session, binding_span,
|
||||
) {
|
||||
debug!("check_for_module_export_macro: previous_span={:?}", previous_span);
|
||||
removal_span = removal_span.with_lo(previous_span.lo());
|
||||
}
|
||||
}
|
||||
debug!("check_for_module_export_macro: removal_span={:?}", removal_span);
|
||||
|
||||
// Find the span after the crate name and if it has nested imports immediatately
|
||||
// after the crate name already.
|
||||
// ie. `use a::b::{c, d};`
|
||||
// ^^^^^^^^^
|
||||
// or `use a::{b, c, d}};`
|
||||
// ^^^^^^^^^^^
|
||||
let (has_nested, after_crate_name) = find_span_immediately_after_crate_name(
|
||||
self.resolver.session, module_name, directive.use_span,
|
||||
);
|
||||
debug!("check_for_module_export_macro: has_nested={:?} after_crate_name={:?}",
|
||||
has_nested, after_crate_name);
|
||||
|
||||
let source_map = self.resolver.session.source_map();
|
||||
|
||||
// Remove two bytes at the end to keep all but the `};` characters.
|
||||
// ie. `{b::{c, d}, e::{f, g}};`
|
||||
// ^^^^^^^^^^^^^^^^^^^^^
|
||||
let end_bytes = BytePos(if has_nested { 2 } else { 1 });
|
||||
let mut remaining_span = after_crate_name.with_hi(
|
||||
after_crate_name.hi() - end_bytes);
|
||||
if has_nested {
|
||||
// Remove two bytes at the start to keep all but the initial `{` character.
|
||||
// ie. `{b::{c, d}, e::{f, g}`
|
||||
// ^^^^^^^^^^^^^^^^^^^^
|
||||
remaining_span = remaining_span.with_lo(after_crate_name.lo() + BytePos(1));
|
||||
}
|
||||
|
||||
// Calculate the number of characters into a snippet to remove the removal
|
||||
// span.
|
||||
let lo = removal_span.lo() - remaining_span.lo();
|
||||
let hi = lo + (removal_span.hi() - removal_span.lo());
|
||||
if let Ok(mut remaining) = source_map.span_to_snippet(remaining_span) {
|
||||
// Remove the original location of the binding.
|
||||
remaining.replace_range((lo.0 as usize)..(hi.0 as usize), "");
|
||||
correction = format!("use {}::{{{}, {}}};", module_name, import, remaining);
|
||||
}
|
||||
}
|
||||
|
||||
let suggestion = Some((
|
||||
directive.span,
|
||||
span,
|
||||
String::from("a macro with this name exists at the root of the crate"),
|
||||
format!("{}::{}", module_name, import),
|
||||
correction,
|
||||
Applicability::MaybeIncorrect,
|
||||
));
|
||||
let note = vec![
|
||||
@ -632,3 +706,149 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Given a `binding_span` of a binding within a use statement:
|
||||
///
|
||||
/// ```
|
||||
/// use foo::{a, b, c};
|
||||
/// ^
|
||||
/// ```
|
||||
///
|
||||
/// then return the span until the next binding or the end of the statement:
|
||||
///
|
||||
/// ```
|
||||
/// use foo::{a, b, c};
|
||||
/// ^^^
|
||||
/// ```
|
||||
pub(crate) fn find_span_of_binding_until_next_binding(
|
||||
sess: &Session,
|
||||
binding_span: Span,
|
||||
use_span: Span,
|
||||
) -> (bool, Span) {
|
||||
let source_map = sess.source_map();
|
||||
|
||||
// Find the span of everything after the binding.
|
||||
// ie. `a, e};` or `a};`
|
||||
let binding_until_end = binding_span.with_hi(use_span.hi());
|
||||
|
||||
// Find everything after the binding but not including the binding.
|
||||
// ie. `, e};` or `};`
|
||||
let after_binding_until_end = binding_until_end.with_lo(binding_span.hi());
|
||||
|
||||
// Keep characters in the span until we encounter something that isn't a comma or
|
||||
// whitespace.
|
||||
// ie. `, ` or ``.
|
||||
//
|
||||
// Also note whether a closing brace character was encountered. If there
|
||||
// was, then later go backwards to remove any trailing commas that are left.
|
||||
let mut found_closing_brace = false;
|
||||
let after_binding_until_next_binding = source_map.span_take_while(
|
||||
after_binding_until_end,
|
||||
|&ch| {
|
||||
if ch == '}' { found_closing_brace = true; }
|
||||
ch == ' ' || ch == ','
|
||||
}
|
||||
);
|
||||
|
||||
// Combine the two spans.
|
||||
// ie. `a, ` or `a`.
|
||||
//
|
||||
// Removing these would leave `issue_52891::{d, e};` or `issue_52891::{d, e, };`
|
||||
let span = binding_span.with_hi(after_binding_until_next_binding.hi());
|
||||
|
||||
(found_closing_brace, span)
|
||||
}
|
||||
|
||||
/// Given a `binding_span`, return the span through to the comma or opening brace of the previous
|
||||
/// binding.
|
||||
///
|
||||
/// ```
|
||||
/// use foo::a::{a, b, c};
|
||||
/// ^^--- binding span
|
||||
/// |
|
||||
/// returned span
|
||||
///
|
||||
/// use foo::{a, b, c};
|
||||
/// --- binding span
|
||||
/// ```
|
||||
pub(crate) fn extend_span_to_previous_binding(
|
||||
sess: &Session,
|
||||
binding_span: Span,
|
||||
) -> Option<Span> {
|
||||
let source_map = sess.source_map();
|
||||
|
||||
// `prev_source` will contain all of the source that came before the span.
|
||||
// Then split based on a command and take the first (ie. closest to our span)
|
||||
// snippet. In the example, this is a space.
|
||||
let prev_source = source_map.span_to_prev_source(binding_span).ok()?;
|
||||
|
||||
let prev_comma = prev_source.rsplit(',').collect::<Vec<_>>();
|
||||
let prev_starting_brace = prev_source.rsplit('{').collect::<Vec<_>>();
|
||||
if prev_comma.len() <= 1 || prev_starting_brace.len() <= 1 {
|
||||
return None;
|
||||
}
|
||||
|
||||
let prev_comma = prev_comma.first().unwrap();
|
||||
let prev_starting_brace = prev_starting_brace.first().unwrap();
|
||||
|
||||
// If the amount of source code before the comma is greater than
|
||||
// the amount of source code before the starting brace then we've only
|
||||
// got one item in the nested item (eg. `issue_52891::{self}`).
|
||||
if prev_comma.len() > prev_starting_brace.len() {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(binding_span.with_lo(BytePos(
|
||||
// Take away the number of bytes for the characters we've found and an
|
||||
// extra for the comma.
|
||||
binding_span.lo().0 - (prev_comma.as_bytes().len() as u32) - 1
|
||||
)))
|
||||
}
|
||||
|
||||
/// Given a `use_span` of a binding within a use statement, returns the highlighted span and if
|
||||
/// it is a nested use tree.
|
||||
///
|
||||
/// ```
|
||||
/// use foo::a::{b, c};
|
||||
/// ^^^^^^^^^^ // false
|
||||
///
|
||||
/// use foo::{a, b, c};
|
||||
/// ^^^^^^^^^^ // true
|
||||
///
|
||||
/// use foo::{a, b::{c, d}};
|
||||
/// ^^^^^^^^^^^^^^^ // true
|
||||
/// ```
|
||||
fn find_span_immediately_after_crate_name(
|
||||
sess: &Session,
|
||||
module_name: Symbol,
|
||||
use_span: Span,
|
||||
) -> (bool, Span) {
|
||||
debug!("find_span_immediately_after_crate_name: module_name={:?} use_span={:?}",
|
||||
module_name, use_span);
|
||||
let source_map = sess.source_map();
|
||||
|
||||
// Get position of the first `{` character for the use statement.
|
||||
// ie. `use foo::{a, b::{c, d}};`
|
||||
// ^
|
||||
let pos_of_use_tree_left_bracket = source_map.span_until_char(use_span, '{').hi();
|
||||
debug!("find_span_immediately_after_crate_name: pos_of_use_tree_left_bracket={:?}",
|
||||
pos_of_use_tree_left_bracket);
|
||||
|
||||
// Calculate the expected difference between the first `{` character and the start of a
|
||||
// use statement.
|
||||
// ie. `use foo::{..};`
|
||||
// ^^^^
|
||||
// | ^^^
|
||||
// 4 | ^^
|
||||
// 3 |
|
||||
// 2
|
||||
let expected_difference = BytePos((module_name.as_str().len() + 4 + 2) as u32);
|
||||
debug!("find_span_immediately_after_crate_name: expected_difference={:?}",
|
||||
expected_difference);
|
||||
let actual_difference = pos_of_use_tree_left_bracket - use_span.lo();
|
||||
debug!("find_span_immediately_after_crate_name: actual_difference={:?}",
|
||||
actual_difference);
|
||||
|
||||
(expected_difference == actual_difference,
|
||||
use_span.with_lo(use_span.lo() + expected_difference))
|
||||
}
|
||||
|
||||
@ -50,7 +50,7 @@ use syntax::ast::{QSelf, TraitItemKind, TraitRef, Ty, TyKind};
|
||||
use syntax::ptr::P;
|
||||
use syntax::{span_err, struct_span_err, unwrap_or, walk_list};
|
||||
|
||||
use syntax_pos::{BytePos, Span, DUMMY_SP, MultiSpan};
|
||||
use syntax_pos::{Span, DUMMY_SP, MultiSpan};
|
||||
use errors::{Applicability, DiagnosticBuilder, DiagnosticId};
|
||||
|
||||
use log::debug;
|
||||
@ -62,6 +62,7 @@ use std::mem::replace;
|
||||
use rustc_data_structures::ptr_key::PtrKey;
|
||||
use rustc_data_structures::sync::Lrc;
|
||||
|
||||
use error_reporting::{find_span_of_binding_until_next_binding, extend_span_to_previous_binding};
|
||||
use resolve_imports::{ImportDirective, ImportDirectiveSubclass, NameResolution, ImportResolver};
|
||||
use macros::{InvocationData, LegacyBinding, ParentScope};
|
||||
|
||||
@ -5144,7 +5145,6 @@ impl<'a> Resolver<'a> {
|
||||
) {
|
||||
assert!(directive.is_nested());
|
||||
let message = "remove unnecessary import";
|
||||
let source_map = self.session.source_map();
|
||||
|
||||
// Two examples will be used to illustrate the span manipulations we're doing:
|
||||
//
|
||||
@ -5153,73 +5153,24 @@ impl<'a> Resolver<'a> {
|
||||
// - Given `use issue_52891::{d, e, a};` where `a` is a duplicate then `binding_span` is
|
||||
// `a` and `directive.use_span` is `issue_52891::{d, e, a};`.
|
||||
|
||||
// Find the span of everything after the binding.
|
||||
// ie. `a, e};` or `a};`
|
||||
let binding_until_end = binding_span.with_hi(directive.use_span.hi());
|
||||
|
||||
// Find everything after the binding but not including the binding.
|
||||
// ie. `, e};` or `};`
|
||||
let after_binding_until_end = binding_until_end.with_lo(binding_span.hi());
|
||||
|
||||
// Keep characters in the span until we encounter something that isn't a comma or
|
||||
// whitespace.
|
||||
// ie. `, ` or ``.
|
||||
//
|
||||
// Also note whether a closing brace character was encountered. If there
|
||||
// was, then later go backwards to remove any trailing commas that are left.
|
||||
let mut found_closing_brace = false;
|
||||
let after_binding_until_next_binding = source_map.span_take_while(
|
||||
after_binding_until_end,
|
||||
|&ch| {
|
||||
if ch == '}' { found_closing_brace = true; }
|
||||
ch == ' ' || ch == ','
|
||||
}
|
||||
let (found_closing_brace, span) = find_span_of_binding_until_next_binding(
|
||||
self.session, binding_span, directive.use_span,
|
||||
);
|
||||
|
||||
// Combine the two spans.
|
||||
// ie. `a, ` or `a`.
|
||||
//
|
||||
// Removing these would leave `issue_52891::{d, e};` or `issue_52891::{d, e, };`
|
||||
let span = binding_span.with_hi(after_binding_until_next_binding.hi());
|
||||
|
||||
// If there was a closing brace then identify the span to remove any trailing commas from
|
||||
// previous imports.
|
||||
if found_closing_brace {
|
||||
if let Ok(prev_source) = source_map.span_to_prev_source(span) {
|
||||
// `prev_source` will contain all of the source that came before the span.
|
||||
// Then split based on a command and take the first (ie. closest to our span)
|
||||
// snippet. In the example, this is a space.
|
||||
let prev_comma = prev_source.rsplit(',').collect::<Vec<_>>();
|
||||
let prev_starting_brace = prev_source.rsplit('{').collect::<Vec<_>>();
|
||||
if prev_comma.len() > 1 && prev_starting_brace.len() > 1 {
|
||||
let prev_comma = prev_comma.first().unwrap();
|
||||
let prev_starting_brace = prev_starting_brace.first().unwrap();
|
||||
|
||||
// If the amount of source code before the comma is greater than
|
||||
// the amount of source code before the starting brace then we've only
|
||||
// got one item in the nested item (eg. `issue_52891::{self}`).
|
||||
if prev_comma.len() > prev_starting_brace.len() {
|
||||
// So just remove the entire line...
|
||||
err.span_suggestion(
|
||||
directive.use_span_with_attributes,
|
||||
message,
|
||||
String::new(),
|
||||
Applicability::MaybeIncorrect,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
let span = span.with_lo(BytePos(
|
||||
// Take away the number of bytes for the characters we've found and an
|
||||
// extra for the comma.
|
||||
span.lo().0 - (prev_comma.as_bytes().len() as u32) - 1
|
||||
));
|
||||
err.tool_only_span_suggestion(
|
||||
span, message, String::new(), Applicability::MaybeIncorrect,
|
||||
);
|
||||
return;
|
||||
}
|
||||
if let Some(span) = extend_span_to_previous_binding(self.session, span) {
|
||||
err.tool_only_span_suggestion(span, message, String::new(),
|
||||
Applicability::MaybeIncorrect);
|
||||
} else {
|
||||
// Remove the entire line if we cannot extend the span back, this indicates a
|
||||
// `issue_52891::{self}` case.
|
||||
err.span_suggestion(directive.use_span_with_attributes, message, String::new(),
|
||||
Applicability::MaybeIncorrect);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
err.span_suggestion(span, message, String::new(), Applicability::MachineApplicable);
|
||||
|
||||
@ -5,4 +5,14 @@ pub mod foo {
|
||||
fn $foo() { }
|
||||
}
|
||||
}
|
||||
|
||||
pub fn baz() {}
|
||||
|
||||
pub fn foobar() {}
|
||||
|
||||
pub mod barbaz {
|
||||
pub fn barfoo() {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn foobaz() {}
|
||||
|
||||
@ -11,11 +11,104 @@
|
||||
|
||||
// Edge cases..
|
||||
|
||||
mod multiple_imports_same_line_at_end {
|
||||
use issue_59764::{makro, foo::{baz}};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_at_end_trailing_comma {
|
||||
use issue_59764::{makro, foo::{
|
||||
baz,
|
||||
//~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}};
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_at_end {
|
||||
use issue_59764::{makro, foo::{
|
||||
baz,
|
||||
//~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}};
|
||||
}
|
||||
|
||||
mod multiple_imports_same_line_in_middle {
|
||||
use issue_59764::{makro, foo::{baz, foobar}};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_in_middle_trailing_comma {
|
||||
use issue_59764::{makro, foo::{
|
||||
baz,
|
||||
//~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
foobar,
|
||||
}};
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_in_middle {
|
||||
use issue_59764::{makro, foo::{
|
||||
baz,
|
||||
//~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
foobar
|
||||
}};
|
||||
}
|
||||
|
||||
mod nested_imports {
|
||||
use issue_59764::{makro, foobaz};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod nested_multiple_imports {
|
||||
use issue_59764::{makro, foobaz, foo::{baz}};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod nested_multiline_multiple_imports_trailing_comma {
|
||||
use issue_59764::{makro,
|
||||
foobaz,
|
||||
foo::{
|
||||
baz,
|
||||
//~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
mod nested_multiline_multiple_imports {
|
||||
use issue_59764::{makro,
|
||||
foobaz,
|
||||
foo::{
|
||||
baz,
|
||||
//~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mod doubly_nested_multiple_imports {
|
||||
use issue_59764::{makro, foobaz, foo::{baz, barbaz::{barfoo}}};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod doubly_multiline_nested_multiple_imports {
|
||||
use issue_59764::{makro,
|
||||
foobaz,
|
||||
foo::{
|
||||
baz,
|
||||
//~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
barbaz::{
|
||||
barfoo,
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mod renamed_import {
|
||||
use issue_59764::makro as baz;
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod renamed_multiple_imports {
|
||||
use issue_59764::{makro as foobar, foo::{baz}};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
// Simple case..
|
||||
|
||||
use issue_59764::makro;
|
||||
|
||||
@ -11,11 +11,104 @@
|
||||
|
||||
// Edge cases..
|
||||
|
||||
mod multiple_imports_same_line_at_end {
|
||||
use issue_59764::foo::{baz, makro};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_at_end_trailing_comma {
|
||||
use issue_59764::foo::{
|
||||
baz,
|
||||
makro, //~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
};
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_at_end {
|
||||
use issue_59764::foo::{
|
||||
baz,
|
||||
makro //~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
};
|
||||
}
|
||||
|
||||
mod multiple_imports_same_line_in_middle {
|
||||
use issue_59764::foo::{baz, makro, foobar};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_in_middle_trailing_comma {
|
||||
use issue_59764::foo::{
|
||||
baz,
|
||||
makro, //~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
foobar,
|
||||
};
|
||||
}
|
||||
|
||||
mod multiple_imports_multiline_in_middle {
|
||||
use issue_59764::foo::{
|
||||
baz,
|
||||
makro, //~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
foobar
|
||||
};
|
||||
}
|
||||
|
||||
mod nested_imports {
|
||||
use issue_59764::{foobaz, foo::makro};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod nested_multiple_imports {
|
||||
use issue_59764::{foobaz, foo::{baz, makro}};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod nested_multiline_multiple_imports_trailing_comma {
|
||||
use issue_59764::{
|
||||
foobaz,
|
||||
foo::{
|
||||
baz,
|
||||
makro, //~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
mod nested_multiline_multiple_imports {
|
||||
use issue_59764::{
|
||||
foobaz,
|
||||
foo::{
|
||||
baz,
|
||||
makro //~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mod doubly_nested_multiple_imports {
|
||||
use issue_59764::{foobaz, foo::{baz, makro, barbaz::{barfoo}}};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod doubly_multiline_nested_multiple_imports {
|
||||
use issue_59764::{
|
||||
foobaz,
|
||||
foo::{
|
||||
baz,
|
||||
makro, //~ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
barbaz::{
|
||||
barfoo,
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mod renamed_import {
|
||||
use issue_59764::foo::makro as baz;
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
mod renamed_multiple_imports {
|
||||
use issue_59764::foo::{baz, makro as foobar};
|
||||
//~^ ERROR unresolved import `issue_59764::foo::makro` [E0432]
|
||||
}
|
||||
|
||||
// Simple case..
|
||||
|
||||
use issue_59764::foo::makro;
|
||||
|
||||
@ -1,5 +1,178 @@
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:15:9
|
||||
--> $DIR/issue-59764.rs:15:33
|
||||
|
|
||||
LL | use issue_59764::foo::{baz, makro};
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foo::{baz}};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:22:9
|
||||
|
|
||||
LL | makro,
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foo::{
|
||||
LL | baz,
|
||||
LL |
|
||||
LL | }};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:29:9
|
||||
|
|
||||
LL | makro
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foo::{
|
||||
LL | baz,
|
||||
LL |
|
||||
LL | }};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:34:33
|
||||
|
|
||||
LL | use issue_59764::foo::{baz, makro, foobar};
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foo::{baz, foobar}};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:41:9
|
||||
|
|
||||
LL | makro,
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foo::{
|
||||
LL | baz,
|
||||
LL |
|
||||
LL | foobar,
|
||||
LL | }};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:49:9
|
||||
|
|
||||
LL | makro,
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foo::{
|
||||
LL | baz,
|
||||
LL |
|
||||
LL | foobar
|
||||
LL | }};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:55:31
|
||||
|
|
||||
LL | use issue_59764::{foobaz, foo::makro};
|
||||
| ^^^^^^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foobaz};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:60:42
|
||||
|
|
||||
LL | use issue_59764::{foobaz, foo::{baz, makro}};
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foobaz, foo::{baz}};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:69:13
|
||||
|
|
||||
LL | makro,
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro,
|
||||
LL | foobaz,
|
||||
LL | foo::{
|
||||
LL | baz,
|
||||
LL |
|
||||
LL | },
|
||||
...
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:79:13
|
||||
|
|
||||
LL | makro
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro,
|
||||
LL | foobaz,
|
||||
LL | foo::{
|
||||
LL | baz,
|
||||
LL |
|
||||
LL | }
|
||||
...
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:85:42
|
||||
|
|
||||
LL | use issue_59764::{foobaz, foo::{baz, makro, barbaz::{barfoo}}};
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro, foobaz, foo::{baz, barbaz::{barfoo}}};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:94:13
|
||||
|
|
||||
LL | makro,
|
||||
| ^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro,
|
||||
LL | foobaz,
|
||||
LL | foo::{
|
||||
LL | baz,
|
||||
LL |
|
||||
LL | barbaz::{
|
||||
...
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:103:9
|
||||
|
|
||||
LL | use issue_59764::foo::makro as baz;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `makro` in `foo`
|
||||
@ -11,7 +184,19 @@ LL | use issue_59764::makro as baz;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:21:5
|
||||
--> $DIR/issue-59764.rs:108:33
|
||||
|
|
||||
LL | use issue_59764::foo::{baz, makro as foobar};
|
||||
| ^^^^^^^^^^^^^^^ no `makro` in `foo`
|
||||
|
|
||||
= note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined
|
||||
help: a macro with this name exists at the root of the crate
|
||||
|
|
||||
LL | use issue_59764::{makro as foobar, foo::{baz}};
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `issue_59764::foo::makro`
|
||||
--> $DIR/issue-59764.rs:114:5
|
||||
|
|
||||
LL | use issue_59764::foo::makro;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^ no `makro` in `foo`
|
||||
@ -23,7 +208,7 @@ LL | use issue_59764::makro;
|
||||
| ^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: cannot determine resolution for the macro `makro`
|
||||
--> $DIR/issue-59764.rs:24:1
|
||||
--> $DIR/issue-59764.rs:117:1
|
||||
|
|
||||
LL | makro!(bar);
|
||||
| ^^^^^
|
||||
@ -31,12 +216,12 @@ LL | makro!(bar);
|
||||
= note: import resolution is stuck, try simplifying macro imports
|
||||
|
||||
error[E0425]: cannot find function `bar` in this scope
|
||||
--> $DIR/issue-59764.rs:28:5
|
||||
--> $DIR/issue-59764.rs:121:5
|
||||
|
|
||||
LL | bar();
|
||||
| ^^^ not found in this scope
|
||||
|
||||
error: aborting due to 4 previous errors
|
||||
error: aborting due to 17 previous errors
|
||||
|
||||
Some errors occurred: E0425, E0432.
|
||||
For more information about an error, try `rustc --explain E0425`.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user