Skip to content

Commit e141246

Browse files
borsbors
committed
Auto merge of rust-lang#100082 - matthiaskrgr:rollup-ywu4iux, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#99933 (parallelize HTML checking tool) - rust-lang#99958 (Improve position named arguments lint underline and formatting names) - rust-lang#100008 (Update all pre-cloned submodules on startup) - rust-lang#100049 (:arrow_up: rust-analyzer) - rust-lang#100070 (Clarify Cargo.toml comments) - rust-lang#100074 (rustc-docs: Be less specific about the representation of `+bundle`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents b759b2e + e20f7f8 commit e141246

File tree

59 files changed

+1103
-423
lines changed

Some content is hidden

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

59 files changed

+1103
-423
lines changed

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,6 +1788,7 @@ dependencies = [
17881788
name = "html-checker"
17891789
version = "0.1.0"
17901790
dependencies = [
1791+
"rayon",
17911792
"walkdir",
17921793
]
17931794

‎compiler/rustc_builtin_macros/src/format.rs

Lines changed: 59 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ use smallvec::SmallVec;
1616

1717
use rustc_lint_defs::builtin::NAMED_ARGUMENTS_USED_POSITIONALLY;
1818
use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiagnostics, LintId};
19+
use rustc_parse_format::Count;
1920
use std::borrow::Cow;
2021
use std::collections::hash_map::Entry;
2122

@@ -57,26 +58,45 @@ struct PositionalNamedArg {
5758
replacement: Symbol,
5859
/// The span for the positional named argument (so the lint can point a message to it)
5960
positional_named_arg_span: Span,
61+
has_formatting: bool,
6062
}
6163

6264
impl PositionalNamedArg {
63-
/// Determines what span to replace with the name of the named argument
64-
fn get_span_to_replace(&self, cx: &Context<'_, '_>) -> Option<Span> {
65+
/// Determines:
66+
/// 1) span to be replaced with the name of the named argument and
67+
/// 2) span to be underlined for error messages
68+
fn get_positional_arg_spans(&self, cx: &Context<'_, '_>) -> (Option<Span>, Option<Span>) {
6569
if let Some(inner_span) = &self.inner_span_to_replace {
66-
return Some(
67-
cx.fmtsp.from_inner(InnerSpan { start: inner_span.start, end: inner_span.end }),
68-
);
70+
let span =
71+
cx.fmtsp.from_inner(InnerSpan { start: inner_span.start, end: inner_span.end });
72+
(Some(span), Some(span))
6973
} else if self.ty == PositionalNamedArgType::Arg {
70-
// In the case of a named argument whose position is implicit, there will not be a span
71-
// to replace. Instead, we insert the name after the `{`, which is the first character
72-
// of arg_span.
73-
return cx
74-
.arg_spans
75-
.get(self.cur_piece)
76-
.map(|arg_span| arg_span.with_lo(arg_span.lo() + BytePos(1)).shrink_to_lo());
74+
// In the case of a named argument whose position is implicit, if the argument *has*
75+
// formatting, there will not be a span to replace. Instead, we insert the name after
76+
// the `{`, which will be the first character of arg_span. If the argument does *not*
77+
// have formatting, there may or may not be a span to replace. This is because
78+
// whitespace is allowed in arguments without formatting (such as `format!("{ }", 1);`)
79+
// but is not allowed in arguments with formatting (an error will be generated in cases
80+
// like `format!("{ :1.1}", 1.0f32);`.
81+
// For the message span, if there is formatting, we want to use the opening `{` and the
82+
// next character, which will the `:` indicating the start of formatting. If there is
83+
// not any formatting, we want to underline the entire span.
84+
cx.arg_spans.get(self.cur_piece).map_or((None, None), |arg_span| {
85+
if self.has_formatting {
86+
(
87+
Some(arg_span.with_lo(arg_span.lo() + BytePos(1)).shrink_to_lo()),
88+
Some(arg_span.with_hi(arg_span.lo() + BytePos(2))),
89+
)
90+
} else {
91+
let replace_start = arg_span.lo() + BytePos(1);
92+
let replace_end = arg_span.hi() - BytePos(1);
93+
let to_replace = arg_span.with_lo(replace_start).with_hi(replace_end);
94+
(Some(to_replace), Some(*arg_span))
95+
}
96+
})
97+
} else {
98+
(None, None)
7799
}
78-
79-
None
80100
}
81101
}
82102

@@ -117,10 +137,18 @@ impl PositionalNamedArgsLint {
117137
cur_piece: usize,
118138
inner_span_to_replace: Option<rustc_parse_format::InnerSpan>,
119139
names: &FxHashMap<Symbol, (usize, Span)>,
140+
has_formatting: bool,
120141
) {
121142
let start_of_named_args = total_args_length - names.len();
122143
if current_positional_arg >= start_of_named_args {
123-
self.maybe_push(format_argument_index, ty, cur_piece, inner_span_to_replace, names)
144+
self.maybe_push(
145+
format_argument_index,
146+
ty,
147+
cur_piece,
148+
inner_span_to_replace,
149+
names,
150+
has_formatting,
151+
)
124152
}
125153
}
126154

@@ -134,6 +162,7 @@ impl PositionalNamedArgsLint {
134162
cur_piece: usize,
135163
inner_span_to_replace: Option<rustc_parse_format::InnerSpan>,
136164
names: &FxHashMap<Symbol, (usize, Span)>,
165+
has_formatting: bool,
137166
) {
138167
let named_arg = names
139168
.iter()
@@ -156,6 +185,7 @@ impl PositionalNamedArgsLint {
156185
inner_span_to_replace,
157186
replacement,
158187
positional_named_arg_span,
188+
has_formatting,
159189
});
160190
}
161191
}
@@ -414,6 +444,9 @@ impl<'a, 'b> Context<'a, 'b> {
414444
PositionalNamedArgType::Precision,
415445
);
416446

447+
let has_precision = arg.format.precision != Count::CountImplied;
448+
let has_width = arg.format.width != Count::CountImplied;
449+
417450
// argument second, if it's an implicit positional parameter
418451
// it's written second, so it should come after width/precision.
419452
let pos = match arg.position {
@@ -426,6 +459,7 @@ impl<'a, 'b> Context<'a, 'b> {
426459
self.curpiece,
427460
Some(arg.position_span),
428461
&self.names,
462+
has_precision || has_width,
429463
);
430464

431465
Exact(i)
@@ -439,6 +473,7 @@ impl<'a, 'b> Context<'a, 'b> {
439473
self.curpiece,
440474
None,
441475
&self.names,
476+
has_precision || has_width,
442477
);
443478
Exact(i)
444479
}
@@ -530,6 +565,7 @@ impl<'a, 'b> Context<'a, 'b> {
530565
self.curpiece,
531566
*inner_span,
532567
&self.names,
568+
true,
533569
);
534570
self.verify_arg_type(Exact(i), Count);
535571
}
@@ -1152,24 +1188,22 @@ pub fn expand_format_args_nl<'cx>(
11521188

11531189
fn create_lints_for_named_arguments_used_positionally(cx: &mut Context<'_, '_>) {
11541190
for named_arg in &cx.unused_names_lint.positional_named_args {
1155-
let arg_span = named_arg.get_span_to_replace(cx);
1191+
let (position_sp_to_replace, position_sp_for_msg) = named_arg.get_positional_arg_spans(cx);
11561192

11571193
let msg = format!("named argument `{}` is not used by name", named_arg.replacement);
1158-
let replacement = match named_arg.ty {
1159-
PositionalNamedArgType::Arg => named_arg.replacement.to_string(),
1160-
_ => named_arg.replacement.to_string() + "$",
1161-
};
11621194

11631195
cx.ecx.buffered_early_lint.push(BufferedEarlyLint {
11641196
span: MultiSpan::from_span(named_arg.positional_named_arg_span),
11651197
msg: msg.clone(),
11661198
node_id: ast::CRATE_NODE_ID,
11671199
lint_id: LintId::of(&NAMED_ARGUMENTS_USED_POSITIONALLY),
1168-
diagnostic: BuiltinLintDiagnostics::NamedArgumentUsedPositionally(
1169-
arg_span,
1170-
named_arg.positional_named_arg_span,
1171-
replacement,
1172-
),
1200+
diagnostic: BuiltinLintDiagnostics::NamedArgumentUsedPositionally {
1201+
position_sp_to_replace,
1202+
position_sp_for_msg,
1203+
named_arg_sp: named_arg.positional_named_arg_span,
1204+
named_arg_name: named_arg.replacement.to_string(),
1205+
is_formatting_arg: named_arg.ty != PositionalNamedArgType::Arg,
1206+
},
11731207
});
11741208
}
11751209
}

‎compiler/rustc_lint/src/context.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -856,13 +856,18 @@ pub trait LintContext: Sized {
856856
Applicability::MachineApplicable,
857857
);
858858
},
859-
BuiltinLintDiagnostics::NamedArgumentUsedPositionally(positional_arg, named_arg, name) => {
860-
db.span_label(named_arg, "this named argument is only referred to by position in formatting string");
861-
if let Some(positional_arg) = positional_arg {
862-
let msg = format!("this formatting argument uses named argument `{}` by position", name);
863-
db.span_label(positional_arg, msg);
859+
BuiltinLintDiagnostics::NamedArgumentUsedPositionally{ position_sp_to_replace, position_sp_for_msg, named_arg_sp, named_arg_name, is_formatting_arg} => {
860+
db.span_label(named_arg_sp, "this named argument is referred to by position in formatting string");
861+
if let Some(positional_arg_for_msg) = position_sp_for_msg {
862+
let msg = format!("this formatting argument uses named argument `{}` by position", named_arg_name);
863+
db.span_label(positional_arg_for_msg, msg);
864+
}
865+
866+
if let Some(positional_arg_to_replace) = position_sp_to_replace {
867+
let name = if is_formatting_arg { named_arg_name + "$" } else { named_arg_name };
868+
864869
db.span_suggestion_verbose(
865-
positional_arg,
870+
positional_arg_to_replace,
866871
"use the named argument by name to avoid ambiguity",
867872
name,
868873
Applicability::MaybeIncorrect,

‎compiler/rustc_lint_defs/src/lib.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,19 @@ pub enum BuiltinLintDiagnostics {
467467
/// If true, the lifetime will be fully elided.
468468
use_span: Option<(Span, bool)>,
469469
},
470-
NamedArgumentUsedPositionally(Option<Span>, Span, String),
470+
NamedArgumentUsedPositionally {
471+
/// Span where the named argument is used by position and will be replaced with the named
472+
/// argument name
473+
position_sp_to_replace: Option<Span>,
474+
/// Span where the named argument is used by position and is used for lint messages
475+
position_sp_for_msg: Option<Span>,
476+
/// Span where the named argument's name is (so we know where to put the warning message)
477+
named_arg_sp: Span,
478+
/// String containing the named arguments name
479+
named_arg_name: String,
480+
/// Indicates if the named argument is used as a width/precision for formatting
481+
is_formatting_arg: bool,
482+
},
471483
}
472484

473485
/// Lints that are buffered up early on in the `Session` before the

‎src/bootstrap/lib.rs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -624,20 +624,6 @@ impl Build {
624624
/// If any submodule has been initialized already, sync it unconditionally.
625625
/// This avoids contributors checking in a submodule change by accident.
626626
pub fn maybe_update_submodules(&self) {
627-
// WARNING: keep this in sync with the submodules hard-coded in bootstrap.py
628-
let mut bootstrap_submodules: Vec<&str> = vec![
629-
"src/tools/rust-installer",
630-
"src/tools/cargo",
631-
"src/tools/rls",
632-
"src/tools/miri",
633-
"library/backtrace",
634-
"library/stdarch",
635-
];
636-
// As in bootstrap.py, we include `rust-analyzer` if `build.vendor` was set in
637-
// `config.toml`.
638-
if self.config.vendor {
639-
bootstrap_submodules.push("src/tools/rust-analyzer");
640-
}
641627
// Avoid running git when there isn't a git checkout.
642628
if !self.config.submodules(&self.rust_info) {
643629
return;
@@ -653,10 +639,8 @@ impl Build {
653639
// Look for `submodule.$name.path = $path`
654640
// Sample output: `submodule.src/rust-installer.path src/tools/rust-installer`
655641
let submodule = Path::new(line.splitn(2, ' ').nth(1).unwrap());
656-
// avoid updating submodules twice
657-
if !bootstrap_submodules.iter().any(|&p| Path::new(p) == submodule)
658-
&& channel::GitInfo::new(false, submodule).is_git()
659-
{
642+
// Don't update the submodule unless it's already been cloned.
643+
if channel::GitInfo::new(false, submodule).is_git() {
660644
self.update_submodule(submodule);
661645
}
662646
}

‎src/doc/rustc/src/command-line-arguments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ but it is not guaranteed. If you need whole archive semantics use `+whole-archiv
8989
This modifier is only compatible with the `static` linking kind.
9090
Using any other kind will result in a compiler error.
9191

92-
When building a rlib or staticlib `+bundle` means that all object files from the native static
93-
library will be added to the rlib or staticlib archive, and then used from it during linking of
94-
the final binary.
92+
When building a rlib or staticlib `+bundle` means that the native static library
93+
will be packed into the rlib or staticlib archive, and then retrieved from there
94+
during linking of the final binary.
9595

9696
When building a rlib `-bundle` means that the native static library is registered as a dependency
9797
of that rlib "by name", and object files from it are included only during linking of the final

‎src/test/ui/macros/issue-98466.stderr

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ warning: named argument `_x` is not used by name
22
--> $DIR/issue-98466.rs:7:26
33
|
44
LL | println!("_x is {}", _x = 5);
5-
| - ^^ this named argument is only referred to by position in formatting string
6-
| |
7-
| this formatting argument uses named argument `_x` by position
5+
| -- ^^ this named argument is referred to by position in formatting string
6+
| |
7+
| this formatting argument uses named argument `_x` by position
88
|
99
= note: `#[warn(named_arguments_used_positionally)]` on by default
1010
help: use the named argument by name to avoid ambiguity
@@ -16,9 +16,9 @@ warning: named argument `y` is not used by name
1616
--> $DIR/issue-98466.rs:10:26
1717
|
1818
LL | println!("_x is {}", y = _x);
19-
| - ^ this named argument is only referred to by position in formatting string
20-
| |
21-
| this formatting argument uses named argument `y` by position
19+
| -- ^ this named argument is referred to by position in formatting string
20+
| |
21+
| this formatting argument uses named argument `y` by position
2222
|
2323
help: use the named argument by name to avoid ambiguity
2424
|
@@ -29,9 +29,9 @@ warning: named argument `y` is not used by name
2929
--> $DIR/issue-98466.rs:13:83
3030
|
3131
LL | println!("first positional arg {}, second positional arg {}, _x is {}", 1, 2, y = _x);
32-
| - ^ this named argument is only referred to by position in formatting string
33-
| |
34-
| this formatting argument uses named argument `y` by position
32+
| -- ^ this named argument is referred to by position in formatting string
33+
| |
34+
| this formatting argument uses named argument `y` by position
3535
|
3636
help: use the named argument by name to avoid ambiguity
3737
|
@@ -42,9 +42,9 @@ warning: named argument `_x` is not used by name
4242
--> $DIR/issue-98466.rs:19:34
4343
|
4444
LL | let _f = format!("_x is {}", _x = 5);
45-
| - ^^ this named argument is only referred to by position in formatting string
46-
| |
47-
| this formatting argument uses named argument `_x` by position
45+
| -- ^^ this named argument is referred to by position in formatting string
46+
| |
47+
| this formatting argument uses named argument `_x` by position
4848
|
4949
help: use the named argument by name to avoid ambiguity
5050
|
@@ -55,9 +55,9 @@ warning: named argument `y` is not used by name
5555
--> $DIR/issue-98466.rs:22:34
5656
|
5757
LL | let _f = format!("_x is {}", y = _x);
58-
| - ^ this named argument is only referred to by position in formatting string
59-
| |
60-
| this formatting argument uses named argument `y` by position
58+
| -- ^ this named argument is referred to by position in formatting string
59+
| |
60+
| this formatting argument uses named argument `y` by position
6161
|
6262
help: use the named argument by name to avoid ambiguity
6363
|
@@ -68,9 +68,9 @@ warning: named argument `y` is not used by name
6868
--> $DIR/issue-98466.rs:25:91
6969
|
7070
LL | let _f = format!("first positional arg {}, second positional arg {}, _x is {}", 1, 2, y = _x);
71-
| - ^ this named argument is only referred to by position in formatting string
72-
| |
73-
| this formatting argument uses named argument `y` by position
71+
| -- ^ this named argument is referred to by position in formatting string
72+
| |
73+
| this formatting argument uses named argument `y` by position
7474
|
7575
help: use the named argument by name to avoid ambiguity
7676
|

0 commit comments

Comments
 (0)