Skip to content

Commit 57c215b

Browse files
borsbors
committed
Auto merge of rust-lang#112609 - matthiaskrgr:rollup-er6weld, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#112197 (Erase regions even if normalization fails in writeback (in new solver)) - rust-lang#112495 (fix(resolve): update shadowed_glob more precision) - rust-lang#112520 (Fix the overflow issue for transmute_generic_consts) - rust-lang#112571 (rustdoc-search: search never type with `!`) - rust-lang#112581 ([rustdoc] Fix URL encoding of % sign) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fa8762b + 623b1d4 commit 57c215b

File tree

21 files changed

+331
-39
lines changed

21 files changed

+331
-39
lines changed

‎compiler/rustc_hir_typeck/src/intrinsicck.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,17 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
8282

8383
// Try to display a sensible error with as much information as possible.
8484
let skeleton_string = |ty: Ty<'tcx>, sk| match sk {
85-
Ok(SizeSkeleton::Known(size)) => format!("{} bits", size.bits()),
8685
Ok(SizeSkeleton::Pointer { tail, .. }) => format!("pointer to `{tail}`"),
86+
Ok(SizeSkeleton::Known(size)) => {
87+
if let Some(v) = u128::from(size.bytes()).checked_mul(8) {
88+
format!("{} bits", v)
89+
} else {
90+
// `u128` should definitely be able to hold the size of different architectures
91+
// larger sizes should be reported as error `are too big for the current architecture`
92+
// otherwise we have a bug somewhere
93+
bug!("{:?} overflow for u128", size)
94+
}
95+
}
8796
Ok(SizeSkeleton::Generic(size)) => {
8897
if let Some(size) = size.try_eval_target_usize(tcx, self.param_env) {
8998
format!("{size} bytes")

‎compiler/rustc_hir_typeck/src/writeback.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
136136

137137
fn write_ty_to_typeck_results(&mut self, hir_id: hir::HirId, ty: Ty<'tcx>) {
138138
debug!("write_ty_to_typeck_results({:?}, {:?})", hir_id, ty);
139-
assert!(!ty.has_infer() && !ty.has_placeholders() && !ty.has_free_regions());
139+
assert!(
140+
!ty.has_infer() && !ty.has_placeholders() && !ty.has_free_regions(),
141+
"{ty} can't be put into typeck results"
142+
);
140143
self.typeck_results.node_types_mut().insert(hir_id, ty);
141144
}
142145

@@ -803,7 +806,11 @@ impl<'cx, 'tcx> TypeFolder<TyCtxt<'tcx>> for Resolver<'cx, 'tcx> {
803806
// We must normalize erasing regions here, since later lints
804807
// expect that types that show up in the typeck are fully
805808
// normalized.
806-
self.fcx.tcx.try_normalize_erasing_regions(self.fcx.param_env, t).unwrap_or(t)
809+
if let Ok(t) = self.fcx.tcx.try_normalize_erasing_regions(self.fcx.param_env, t) {
810+
t
811+
} else {
812+
EraseEarlyRegions { tcx: self.fcx.tcx }.fold_ty(t)
813+
}
807814
}
808815
Ok(t) => {
809816
// Do not anonymize late-bound regions

‎compiler/rustc_resolve/src/imports.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,21 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
338338
} else {
339339
resolution.binding = Some(nonglob_binding);
340340
}
341-
resolution.shadowed_glob = Some(glob_binding);
341+
342+
if let Some(old_binding) = resolution.shadowed_glob {
343+
assert!(old_binding.is_glob_import());
344+
if glob_binding.res() != old_binding.res() {
345+
resolution.shadowed_glob = Some(this.ambiguity(
346+
AmbiguityKind::GlobVsGlob,
347+
old_binding,
348+
glob_binding,
349+
));
350+
} else if !old_binding.vis.is_at_least(binding.vis, this.tcx) {
351+
resolution.shadowed_glob = Some(glob_binding);
352+
}
353+
} else {
354+
resolution.shadowed_glob = Some(glob_binding);
355+
}
342356
}
343357
(false, false) => {
344358
return Err(old_binding);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,8 +1940,6 @@ pub(crate) fn small_url_encode(s: String) -> String {
19401940
// While the same is not true for hashes, rustdoc only needs to be
19411941
// consistent with itself when encoding them.
19421942
st += "+";
1943-
} else if b == b'%' {
1944-
st += "%%";
19451943
} else {
19461944
write!(st, "%{:02X}", b).unwrap();
19471945
}

‎src/librustdoc/html/static/js/search.js

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,35 @@ function initSearch(rawSearchIndex) {
386386
if (query.literalSearch && parserState.totalElems - parserState.genericsElems > 0) {
387387
throw ["You cannot have more than one element if you use quotes"];
388388
}
389+
const typeFilter = parserState.typeFilter;
390+
parserState.typeFilter = null;
391+
if (name === "!") {
392+
if (typeFilter !== null && typeFilter !== "primitive") {
393+
throw [
394+
"Invalid search type: primitive never type ",
395+
"!",
396+
" and ",
397+
typeFilter,
398+
" both specified",
399+
];
400+
}
401+
if (generics.length !== 0) {
402+
throw [
403+
"Never type ",
404+
"!",
405+
" does not accept generic parameters",
406+
];
407+
}
408+
return {
409+
name: "never",
410+
id: -1,
411+
fullPath: ["never"],
412+
pathWithoutLast: [],
413+
pathLast: "never",
414+
generics: [],
415+
typeFilter: "primitive",
416+
};
417+
}
389418
const pathSegments = name.split("::");
390419
if (pathSegments.length > 1) {
391420
for (let i = 0, len = pathSegments.length; i < len; ++i) {
@@ -399,6 +428,13 @@ function initSearch(rawSearchIndex) {
399428
}
400429
throw ["Unexpected ", "::::"];
401430
}
431+
432+
if (pathSegment === "!") {
433+
pathSegments[i] = "never";
434+
if (i !== 0) {
435+
throw ["Never type ", "!", " is not associated item"];
436+
}
437+
}
402438
}
403439
}
404440
// In case we only have something like `<p>`, there is no name.
@@ -409,8 +445,6 @@ function initSearch(rawSearchIndex) {
409445
if (isInGenerics) {
410446
parserState.genericsElems += 1;
411447
}
412-
const typeFilter = parserState.typeFilter;
413-
parserState.typeFilter = null;
414448
return {
415449
name: name,
416450
id: -1,
@@ -459,10 +493,11 @@ function initSearch(rawSearchIndex) {
459493
break;
460494
}
461495
if (foundExclamation !== -1) {
462-
if (start <= (end - 2)) {
496+
if (foundExclamation !== start &&
497+
isIdentCharacter(parserState.userQuery[foundExclamation - 1])
498+
) {
463499
throw ["Cannot have associated items in macros"];
464500
} else {
465-
// if start == end - 1, we got the never type
466501
// while the never type has no associated macros, we still
467502
// can parse a path like that
468503
foundExclamation = -1;
@@ -478,7 +513,10 @@ function initSearch(rawSearchIndex) {
478513
end = parserState.pos;
479514
}
480515
// if start == end - 1, we got the never type
481-
if (foundExclamation !== -1 && start <= (end - 2)) {
516+
if (foundExclamation !== -1 &&
517+
foundExclamation !== start &&
518+
isIdentCharacter(parserState.userQuery[foundExclamation - 1])
519+
) {
482520
if (parserState.typeFilter === null) {
483521
parserState.typeFilter = "macro";
484522
} else if (parserState.typeFilter !== "macro") {

‎src/tools/tidy/src/ui_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
1010

1111
const ENTRY_LIMIT: usize = 900;
1212
// FIXME: The following limits should be reduced eventually.
13-
const ISSUES_ENTRY_LIMIT: usize = 1898;
13+
const ISSUES_ENTRY_LIMIT: usize = 1896;
1414
const ROOT_ENTRY_LIMIT: usize = 870;
1515

1616
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[

‎tests/rustdoc-js-std/never.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
const EXPECTED = {
2-
'query': '!',
3-
'others': [
4-
{ 'path': 'std', 'name': 'never' },
5-
],
6-
};
1+
const EXPECTED = [
2+
{
3+
'query': '!',
4+
'others': [
5+
{ 'path': 'std', 'name': 'never' },
6+
],
7+
},
8+
{
9+
'query': '!::clone',
10+
'others': [
11+
{ 'path': 'std::never', 'name': 'clone' },
12+
],
13+
},
14+
];

‎tests/rustdoc-js-std/parser-errors.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,15 @@ const PARSED = [
359359
userQuery: "mod:a!",
360360
error: 'Invalid search type: macro `!` and `mod` both specified',
361361
},
362+
{
363+
query: "mod:!",
364+
elems: [],
365+
foundElems: 0,
366+
original: "mod:!",
367+
returned: [],
368+
userQuery: "mod:!",
369+
error: 'Invalid search type: primitive never type `!` and `mod` both specified',
370+
},
362371
{
363372
query: "a!::a",
364373
elems: [],

‎tests/rustdoc-js-std/parser-ident.js

Lines changed: 71 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ const PARSED = [
88
pathLast: "r",
99
generics: [
1010
{
11-
name: "!",
12-
fullPath: ["!"],
11+
name: "never",
12+
fullPath: ["never"],
1313
pathWithoutLast: [],
14-
pathLast: "!",
14+
pathLast: "never",
1515
generics: [],
16+
typeFilter: 15,
1617
},
1718
],
1819
typeFilter: -1,
@@ -26,12 +27,12 @@ const PARSED = [
2627
{
2728
query: "!",
2829
elems: [{
29-
name: "!",
30-
fullPath: ["!"],
30+
name: "never",
31+
fullPath: ["never"],
3132
pathWithoutLast: [],
32-
pathLast: "!",
33+
pathLast: "never",
3334
generics: [],
34-
typeFilter: -1,
35+
typeFilter: 15,
3536
}],
3637
foundElems: 1,
3738
original: "!",
@@ -64,12 +65,21 @@ const PARSED = [
6465
userQuery: "a!::b",
6566
error: "Cannot have associated items in macros",
6667
},
68+
{
69+
query: "!<T>",
70+
elems: [],
71+
foundElems: 0,
72+
original: "!<T>",
73+
returned: [],
74+
userQuery: "!<t>",
75+
error: "Never type `!` does not accept generic parameters",
76+
},
6777
{
6878
query: "!::b",
6979
elems: [{
7080
name: "!::b",
71-
fullPath: ["!", "b"],
72-
pathWithoutLast: ["!"],
81+
fullPath: ["never", "b"],
82+
pathWithoutLast: ["never"],
7383
pathLast: "b",
7484
generics: [],
7585
typeFilter: -1,
@@ -80,6 +90,58 @@ const PARSED = [
8090
userQuery: "!::b",
8191
error: null,
8292
},
93+
{
94+
query: "b::!",
95+
elems: [],
96+
foundElems: 0,
97+
original: "b::!",
98+
returned: [],
99+
userQuery: "b::!",
100+
error: "Never type `!` is not associated item",
101+
},
102+
{
103+
query: "!::!",
104+
elems: [],
105+
foundElems: 0,
106+
original: "!::!",
107+
returned: [],
108+
userQuery: "!::!",
109+
error: "Never type `!` is not associated item",
110+
},
111+
{
112+
query: "b::!::c",
113+
elems: [],
114+
foundElems: 0,
115+
original: "b::!::c",
116+
returned: [],
117+
userQuery: "b::!::c",
118+
error: "Never type `!` is not associated item",
119+
},
120+
{
121+
query: "!::b<T>",
122+
elems: [{
123+
name: "!::b",
124+
fullPath: ["never", "b"],
125+
pathWithoutLast: ["never"],
126+
pathLast: "b",
127+
generics: [
128+
{
129+
name: "t",
130+
fullPath: ["t"],
131+
pathWithoutLast: [],
132+
pathLast: "t",
133+
generics: [],
134+
typeFilter: -1,
135+
}
136+
],
137+
typeFilter: -1,
138+
}],
139+
foundElems: 1,
140+
original: "!::b<T>",
141+
returned: [],
142+
userQuery: "!::b<t>",
143+
error: null,
144+
},
83145
{
84146
query: "a!::b!",
85147
elems: [],

‎tests/rustdoc-js-std/parser-returned.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ const PARSED = [
8484
foundElems: 1,
8585
original: "-> !",
8686
returned: [{
87-
name: "!",
88-
fullPath: ["!"],
87+
name: "never",
88+
fullPath: ["never"],
8989
pathWithoutLast: [],
90-
pathLast: "!",
90+
pathLast: "never",
9191
generics: [],
92-
typeFilter: -1,
92+
typeFilter: 15,
9393
}],
9494
userQuery: "-> !",
9595
error: null,

0 commit comments

Comments
 (0)