Skip to content

Commit 250384e

Browse files
borsbors
committed
Auto merge of #93573 - matthiaskrgr:rollup-nrjmygz, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #92758 (librustdoc: impl core::fmt::Write for rustdoc::html::render::Buffer) - #92788 (Detect `::` -> `:` typo in type argument) - #93420 (Improve wrapping on settings page) - #93493 (Document valid values of the char type) - #93531 (Fix incorrect panic message in example) - #93559 (Add missing | between print options) - #93560 (Fix two incorrect "it's" (typos in comments)) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents d5f9c40 + 344bb59 commit 250384e

File tree

14 files changed

+248
-25
lines changed

14 files changed

+248
-25
lines changed

‎compiler/rustc_middle/src/mir/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,7 @@ pub enum FakeReadCause {
16421642
ForMatchedPlace(Option<DefId>),
16431643

16441644
/// A fake read of the RefWithinGuard version of a bind-by-value variable
1645-
/// in a match guard to ensure that it's value hasn't change by the time
1645+
/// in a match guard to ensure that its value hasn't change by the time
16461646
/// we create the OutsideGuard version.
16471647
ForGuardBinding,
16481648

@@ -2939,7 +2939,7 @@ impl Location {
29392939
let mut visited = FxHashSet::default();
29402940

29412941
while let Some(block) = queue.pop() {
2942-
// If we haven't visited this block before, then make sure we visit it's predecessors.
2942+
// If we haven't visited this block before, then make sure we visit its predecessors.
29432943
if visited.insert(block) {
29442944
queue.extend(predecessors[block].iter().cloned());
29452945
} else {

‎compiler/rustc_resolve/src/late.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,8 @@ struct DiagnosticMetadata<'ast> {
400400

401401
/// Given `where <T as Bar>::Baz: String`, suggest `where T: Bar<Baz = String>`.
402402
current_where_predicate: Option<&'ast WherePredicate>,
403+
404+
current_type_path: Option<&'ast Ty>,
403405
}
404406

405407
struct LateResolutionVisitor<'a, 'b, 'ast> {
@@ -472,8 +474,10 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
472474
}
473475
fn visit_ty(&mut self, ty: &'ast Ty) {
474476
let prev = self.diagnostic_metadata.current_trait_object;
477+
let prev_ty = self.diagnostic_metadata.current_type_path;
475478
match ty.kind {
476479
TyKind::Path(ref qself, ref path) => {
480+
self.diagnostic_metadata.current_type_path = Some(ty);
477481
self.smart_resolve_path(ty.id, qself.as_ref(), path, PathSource::Type);
478482
}
479483
TyKind::ImplicitSelf => {
@@ -490,6 +494,7 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
490494
}
491495
visit::walk_ty(self, ty);
492496
self.diagnostic_metadata.current_trait_object = prev;
497+
self.diagnostic_metadata.current_type_path = prev_ty;
493498
}
494499
fn visit_poly_trait_ref(&mut self, tref: &'ast PolyTraitRef, m: &'ast TraitBoundModifier) {
495500
self.smart_resolve_path(
@@ -1936,7 +1941,6 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
19361941
let instead = res.is_some();
19371942
let suggestion =
19381943
if res.is_none() { this.report_missing_type_error(path) } else { None };
1939-
// get_from_node_id
19401944

19411945
this.r.use_injections.push(UseError {
19421946
err,

‎compiler/rustc_resolve/src/late/diagnostics.rs

+37
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use rustc_span::symbol::{kw, sym, Ident, Symbol};
2626
use rustc_span::{BytePos, MultiSpan, Span, DUMMY_SP};
2727

2828
use std::iter;
29+
use std::ops::Deref;
2930

3031
use tracing::debug;
3132

@@ -265,6 +266,8 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
265266
}
266267
}
267268

269+
self.detect_assoct_type_constraint_meant_as_path(base_span, &mut err);
270+
268271
// Emit special messages for unresolved `Self` and `self`.
269272
if is_self_type(path, ns) {
270273
err.code(rustc_errors::error_code!(E0411));
@@ -603,6 +606,40 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
603606
(err, candidates)
604607
}
605608

609+
fn detect_assoct_type_constraint_meant_as_path(
610+
&self,
611+
base_span: Span,
612+
err: &mut DiagnosticBuilder<'_>,
613+
) {
614+
let Some(ty) = self.diagnostic_metadata.current_type_path else { return; };
615+
let TyKind::Path(_, path) = &ty.kind else { return; };
616+
for segment in &path.segments {
617+
let Some(params) = &segment.args else { continue; };
618+
let ast::GenericArgs::AngleBracketed(ref params) = params.deref() else { continue; };
619+
for param in &params.args {
620+
let ast::AngleBracketedArg::Constraint(constraint) = param else { continue; };
621+
let ast::AssocConstraintKind::Bound { bounds } = &constraint.kind else {
622+
continue;
623+
};
624+
for bound in bounds {
625+
let ast::GenericBound::Trait(trait_ref, ast::TraitBoundModifier::None)
626+
= bound else
627+
{
628+
continue;
629+
};
630+
if base_span == trait_ref.span {
631+
err.span_suggestion_verbose(
632+
constraint.ident.span.between(trait_ref.span),
633+
"you might have meant to write a path instead of an associated type bound",
634+
"::".to_string(),
635+
Applicability::MachineApplicable,
636+
);
637+
}
638+
}
639+
}
640+
}
641+
}
642+
606643
fn get_single_associated_item(
607644
&mut self,
608645
path: &[Segment],

‎compiler/rustc_session/src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
11881188
"Compiler information to print on stdout",
11891189
"[crate-name|file-names|sysroot|target-libdir|cfg|target-list|\
11901190
target-cpus|target-features|relocation-models|code-models|\
1191-
tls-models|target-spec-json|native-static-libs|stack-protector-strategies\
1191+
tls-models|target-spec-json|native-static-libs|stack-protector-strategies|\
11921192
link-args]",
11931193
),
11941194
opt::flagmulti_s("g", "", "Equivalent to -C debuginfo=2"),

‎library/core/src/primitive_docs.rs

+54-5
Original file line numberDiff line numberDiff line change
@@ -275,20 +275,69 @@ mod prim_bool {}
275275
mod prim_never {}
276276

277277
#[doc(primitive = "char")]
278+
#[allow(rustdoc::invalid_rust_codeblocks)]
278279
/// A character type.
279280
///
280281
/// The `char` type represents a single character. More specifically, since
281282
/// 'character' isn't a well-defined concept in Unicode, `char` is a '[Unicode
282-
/// scalar value]', which is similar to, but not the same as, a '[Unicode code
283-
/// point]'.
284-
///
285-
/// [Unicode scalar value]: https://www.unicode.org/glossary/#unicode_scalar_value
286-
/// [Unicode code point]: https://www.unicode.org/glossary/#code_point
283+
/// scalar value]'.
287284
///
288285
/// This documentation describes a number of methods and trait implementations on the
289286
/// `char` type. For technical reasons, there is additional, separate
290287
/// documentation in [the `std::char` module](char/index.html) as well.
291288
///
289+
/// # Validity
290+
///
291+
/// A `char` is a '[Unicode scalar value]', which is any '[Unicode code point]'
292+
/// other than a [surrogate code point]. This has a fixed numerical definition:
293+
/// code points are in the range 0 to 0x10FFFF, inclusive.
294+
/// Surrogate code points, used by UTF-16, are in the range 0xD800 to 0xDFFF.
295+
///
296+
/// No `char` may be constructed, whether as a literal or at runtime, that is not a
297+
/// Unicode scalar value:
298+
///
299+
/// ```compile_fail
300+
/// // Each of these is a compiler error
301+
/// ['\u{D800}', '\u{DFFF}', '\u{110000}'];
302+
/// ```
303+
///
304+
/// ```should_panic
305+
/// // Panics; from_u32 returns None.
306+
/// char::from_u32(0xDE01).unwrap();
307+
/// ```
308+
///
309+
/// ```no_run
310+
/// // Undefined behaviour
311+
/// unsafe { char::from_u32_unchecked(0x110000) };
312+
/// ```
313+
///
314+
/// USVs are also the exact set of values that may be encoded in UTF-8. Because
315+
/// `char` values are USVs and `str` values are valid UTF-8, it is safe to store
316+
/// any `char` in a `str` or read any character from a `str` as a `char`.
317+
///
318+
/// The gap in valid `char` values is understood by the compiler, so in the
319+
/// below example the two ranges are understood to cover the whole range of
320+
/// possible `char` values and there is no error for a [non-exhaustive match].
321+
///
322+
/// ```
323+
/// let c: char = 'a';
324+
/// match c {
325+
/// '\0' ..= '\u{D7FF}' => false,
326+
/// '\u{E000}' ..= '\u{10FFFF}' => true,
327+
/// };
328+
/// ```
329+
///
330+
/// All USVs are valid `char` values, but not all of them represent a real
331+
/// character. Many USVs are not currently assigned to a character, but may be
332+
/// in the future ("reserved"); some will never be a character
333+
/// ("noncharacters"); and some may be given different meanings by different
334+
/// users ("private use").
335+
///
336+
/// [Unicode code point]: https://www.unicode.org/glossary/#code_point
337+
/// [Unicode scalar value]: https://www.unicode.org/glossary/#unicode_scalar_value
338+
/// [non-exhaustive match]: ../book/ch06-02-match.html#matches-are-exhaustive
339+
/// [surrogate code point]: https://www.unicode.org/glossary/#surrogate_code_point
340+
///
292341
/// # Representation
293342
///
294343
/// `char` is always four bytes in size. This is a different representation than

‎library/std/src/net/tcp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl TcpStream {
405405
/// use std::net::TcpStream;
406406
///
407407
/// let stream = TcpStream::connect("127.0.0.1:8000")
408-
/// .expect("couldn't bind to address");
408+
/// .expect("Couldn't connect to the server...");
409409
/// let mut buf = [0; 10];
410410
/// let len = stream.peek(&mut buf).expect("peek failed");
411411
/// ```

‎library/std/src/primitive_docs.rs

+54-5
Original file line numberDiff line numberDiff line change
@@ -275,20 +275,69 @@ mod prim_bool {}
275275
mod prim_never {}
276276

277277
#[doc(primitive = "char")]
278+
#[allow(rustdoc::invalid_rust_codeblocks)]
278279
/// A character type.
279280
///
280281
/// The `char` type represents a single character. More specifically, since
281282
/// 'character' isn't a well-defined concept in Unicode, `char` is a '[Unicode
282-
/// scalar value]', which is similar to, but not the same as, a '[Unicode code
283-
/// point]'.
284-
///
285-
/// [Unicode scalar value]: https://www.unicode.org/glossary/#unicode_scalar_value
286-
/// [Unicode code point]: https://www.unicode.org/glossary/#code_point
283+
/// scalar value]'.
287284
///
288285
/// This documentation describes a number of methods and trait implementations on the
289286
/// `char` type. For technical reasons, there is additional, separate
290287
/// documentation in [the `std::char` module](char/index.html) as well.
291288
///
289+
/// # Validity
290+
///
291+
/// A `char` is a '[Unicode scalar value]', which is any '[Unicode code point]'
292+
/// other than a [surrogate code point]. This has a fixed numerical definition:
293+
/// code points are in the range 0 to 0x10FFFF, inclusive.
294+
/// Surrogate code points, used by UTF-16, are in the range 0xD800 to 0xDFFF.
295+
///
296+
/// No `char` may be constructed, whether as a literal or at runtime, that is not a
297+
/// Unicode scalar value:
298+
///
299+
/// ```compile_fail
300+
/// // Each of these is a compiler error
301+
/// ['\u{D800}', '\u{DFFF}', '\u{110000}'];
302+
/// ```
303+
///
304+
/// ```should_panic
305+
/// // Panics; from_u32 returns None.
306+
/// char::from_u32(0xDE01).unwrap();
307+
/// ```
308+
///
309+
/// ```no_run
310+
/// // Undefined behaviour
311+
/// unsafe { char::from_u32_unchecked(0x110000) };
312+
/// ```
313+
///
314+
/// USVs are also the exact set of values that may be encoded in UTF-8. Because
315+
/// `char` values are USVs and `str` values are valid UTF-8, it is safe to store
316+
/// any `char` in a `str` or read any character from a `str` as a `char`.
317+
///
318+
/// The gap in valid `char` values is understood by the compiler, so in the
319+
/// below example the two ranges are understood to cover the whole range of
320+
/// possible `char` values and there is no error for a [non-exhaustive match].
321+
///
322+
/// ```
323+
/// let c: char = 'a';
324+
/// match c {
325+
/// '\0' ..= '\u{D7FF}' => false,
326+
/// '\u{E000}' ..= '\u{10FFFF}' => true,
327+
/// };
328+
/// ```
329+
///
330+
/// All USVs are valid `char` values, but not all of them represent a real
331+
/// character. Many USVs are not currently assigned to a character, but may be
332+
/// in the future ("reserved"); some will never be a character
333+
/// ("noncharacters"); and some may be given different meanings by different
334+
/// users ("private use").
335+
///
336+
/// [Unicode code point]: https://www.unicode.org/glossary/#code_point
337+
/// [Unicode scalar value]: https://www.unicode.org/glossary/#unicode_scalar_value
338+
/// [non-exhaustive match]: ../book/ch06-02-match.html#matches-are-exhaustive
339+
/// [surrogate code point]: https://www.unicode.org/glossary/#surrogate_code_point
340+
///
292341
/// # Representation
293342
///
294343
/// `char` is always four bytes in size. This is a different representation than

‎src/librustdoc/html/format.rs

+17
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,23 @@ crate struct Buffer {
6464
buffer: String,
6565
}
6666

67+
impl core::fmt::Write for Buffer {
68+
#[inline]
69+
fn write_str(&mut self, s: &str) -> fmt::Result {
70+
self.buffer.write_str(s)
71+
}
72+
73+
#[inline]
74+
fn write_char(&mut self, c: char) -> fmt::Result {
75+
self.buffer.write_char(c)
76+
}
77+
78+
#[inline]
79+
fn write_fmt(self: &mut Self, args: fmt::Arguments<'_>) -> fmt::Result {
80+
self.buffer.write_fmt(args)
81+
}
82+
}
83+
6784
impl Buffer {
6885
crate fn empty_from(v: &Buffer) -> Buffer {
6986
Buffer { for_html: v.for_html, buffer: String::new() }

‎src/librustdoc/html/render/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ impl Setting {
376376
description,
377377
),
378378
Setting::Select { js_data_name, description, default_value, ref options } => format!(
379-
"<div class=\"setting-line\"><div class=\"radio-line\" id=\"{}\"><span class=\"setting-name\">{}</span>{}</div></div>",
379+
"<div class=\"setting-line\"><div class=\"radio-line\" id=\"{}\"><span class=\"setting-name\">{}</span><div class=\"choices\">{}</div></div></div>",
380380
js_data_name,
381381
description,
382382
options

‎src/librustdoc/html/render/print_item.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ pub(super) fn print_item(cx: &Context<'_>, item: &clean::Item, buf: &mut Buffer,
139139
src_href: src_href.as_deref(),
140140
};
141141

142-
let heading = item_vars.render().unwrap();
143-
buf.write_str(&heading);
142+
item_vars.render_into(buf).unwrap();
144143

145144
match *item.kind {
146145
clean::ModuleItem(ref m) => item_module(buf, cx, item, &m.items),

‎src/librustdoc/html/static/css/settings.css

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.setting-line {
2-
padding: 5px;
2+
margin: 0.6em 0 0.6em 0.3em;
33
position: relative;
44
}
55

@@ -17,17 +17,16 @@
1717
border-bottom: 1px solid;
1818
}
1919

20-
.setting-line .radio-line {
20+
.setting-line .radio-line,
21+
.setting-line .choices {
2122
display: flex;
2223
flex-wrap: wrap;
2324
}
2425

25-
.setting-line .radio-line > * {
26-
padding: 0.3em;
27-
}
28-
2926
.setting-line .radio-line .setting-name {
3027
flex-grow: 1;
28+
margin-top: auto;
29+
margin-bottom: auto;
3130
}
3231

3332
.setting-line .radio-line input {
@@ -38,7 +37,10 @@
3837
border-radius: 0.1em;
3938
border: 1px solid;
4039
margin-left: 0.5em;
41-
min-width: 3.5em;
40+
margin-top: 0.1em;
41+
margin-bottom: 0.1em;
42+
min-width: 3.8em;
43+
padding: 0.3em;
4244
}
4345

4446
.toggle {

‎src/test/rustdoc-gui/mobile.goml

+6
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,9 @@ assert-css: (".content .out-of-band .since::before", { "content": "\"Since \"" }
1919

2020
size: (1000, 1000)
2121
assert-css-false: (".content .out-of-band .since::before", { "content": "\"Since \"" })
22+
23+
// On the settings page, the theme buttons should not line-wrap. Instead, they should
24+
// all be placed as a group on a line below the setting name "Theme."
25+
goto: file://|DOC_PATH|/settings.html
26+
size: (400, 600)
27+
compare-elements-position-near-false: ("#preferred-light-theme .setting-name", "#preferred-light-theme .choice", {"y": 16})

‎src/test/ui/suggestions/type-ascription-instead-of-path-in-type.rs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
enum A {
2+
B,
3+
}
4+
5+
fn main() {
6+
let _: Vec<A:B> = A::B;
7+
//~^ ERROR cannot find trait `B` in this scope
8+
//~| HELP you might have meant to write a path instead of an associated type bound
9+
//~| ERROR associated type bounds are unstable
10+
//~| HELP add `#![feature(associated_type_bounds)]` to the crate attributes to enable
11+
//~| ERROR struct takes at least 1 generic argument but 0 generic arguments were supplied
12+
//~| HELP add missing generic argument
13+
//~| ERROR associated type bindings are not allowed here
14+
}

0 commit comments

Comments
 (0)