Skip to content

Commit db7ff98

Browse files
borsbors
committed
Auto merge of rust-lang#114307 - matthiaskrgr:rollup-8k5rq16, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#112858 (Update Android system definitions and add riscv-linux-android as tier 3 target) - rust-lang#113717 (remove repetitive words) - rust-lang#113725 (Move MinGW linker dist option to proper section) - rust-lang#113740 (Update `.gitmodules` to use shallow submodule clones) - rust-lang#113889 (Fix ice tests when librustc-driver is linked dynamically) - rust-lang#113906 (etc: add `RUSTC_BOOTSTRAP` to rust-analyzer config) - rust-lang#113920 (fix(resolve): report unresolved imports firstly) - rust-lang#114111 (Improve test case for experimental API remove_matches) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b3df56a + e981db0 commit db7ff98

File tree

19 files changed

+159
-36
lines changed

19 files changed

+159
-36
lines changed

‎.gitmodules

+11
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,45 @@
11
[submodule "src/doc/nomicon"]
22
path = src/doc/nomicon
33
url = https://github.com/rust-lang/nomicon.git
4+
shallow = true
45
[submodule "src/tools/cargo"]
56
path = src/tools/cargo
67
url = https://github.com/rust-lang/cargo.git
8+
shallow = true
79
[submodule "src/doc/reference"]
810
path = src/doc/reference
911
url = https://github.com/rust-lang/reference.git
12+
shallow = true
1013
[submodule "src/doc/book"]
1114
path = src/doc/book
1215
url = https://github.com/rust-lang/book.git
16+
shallow = true
1317
[submodule "src/doc/rust-by-example"]
1418
path = src/doc/rust-by-example
1519
url = https://github.com/rust-lang/rust-by-example.git
20+
shallow = true
1621
[submodule "library/stdarch"]
1722
path = library/stdarch
1823
url = https://github.com/rust-lang/stdarch.git
24+
shallow = true
1925
[submodule "src/doc/rustc-dev-guide"]
2026
path = src/doc/rustc-dev-guide
2127
url = https://github.com/rust-lang/rustc-dev-guide.git
28+
shallow = true
2229
[submodule "src/doc/edition-guide"]
2330
path = src/doc/edition-guide
2431
url = https://github.com/rust-lang/edition-guide.git
32+
shallow = true
2533
[submodule "src/llvm-project"]
2634
path = src/llvm-project
2735
url = https://github.com/rust-lang/llvm-project.git
2836
branch = rustc/16.0-2023-06-05
37+
shallow = true
2938
[submodule "src/doc/embedded-book"]
3039
path = src/doc/embedded-book
3140
url = https://github.com/rust-embedded/book.git
41+
shallow = true
3242
[submodule "library/backtrace"]
3343
path = library/backtrace
3444
url = https://github.com/rust-lang/backtrace-rs.git
45+
shallow = true

‎compiler/rustc_codegen_ssa/src/back/write.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ impl<B: WriteBackendMethods> WorkItem<B> {
708708
fn desc(short: &str, _long: &str, name: &str) -> String {
709709
// The short label is three bytes, and is followed by a space. That
710710
// leaves 11 bytes for the CGU name. How we obtain those 11 bytes
711-
// depends on the the CGU name form.
711+
// depends on the CGU name form.
712712
//
713713
// - Non-incremental, e.g. `regex.f10ba03eb5ec7975-cgu.0`: the part
714714
// before the `-cgu.0` is the same for every CGU, so use the

‎compiler/rustc_data_structures/src/sync/worker_local.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub struct WorkerLocal<T> {
116116

117117
// This is safe because the `deref` call will return a reference to a `T` unique to each thread
118118
// or it will panic for threads without an associated local. So there isn't a need for `T` to do
119-
// it's own synchronization. The `verify` method on `RegistryId` has an issue where the the id
119+
// it's own synchronization. The `verify` method on `RegistryId` has an issue where the id
120120
// can be reused, but `WorkerLocal` has a reference to `Registry` which will prevent any reuse.
121121
#[cfg(parallel_compiler)]
122122
unsafe impl<T: Send> Sync for WorkerLocal<T> {}

‎compiler/rustc_resolve/src/imports.rs

+30-23
Original file line numberDiff line numberDiff line change
@@ -533,15 +533,15 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
533533
let indeterminate_imports = mem::take(&mut self.indeterminate_imports);
534534

535535
for (is_indeterminate, import) in determined_imports
536-
.into_iter()
536+
.iter()
537537
.map(|i| (false, i))
538-
.chain(indeterminate_imports.into_iter().map(|i| (true, i)))
538+
.chain(indeterminate_imports.iter().map(|i| (true, i)))
539539
{
540-
let unresolved_import_error = self.finalize_import(import);
540+
let unresolved_import_error = self.finalize_import(*import);
541541

542542
// If this import is unresolved then create a dummy import
543543
// resolution for it so that later resolve stages won't complain.
544-
self.import_dummy_binding(import, is_indeterminate);
544+
self.import_dummy_binding(*import, is_indeterminate);
545545

546546
if let Some(err) = unresolved_import_error {
547547
if let ImportKind::Single { source, ref source_bindings, .. } = import.kind {
@@ -563,27 +563,34 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
563563
errors = vec![];
564564
}
565565
if seen_spans.insert(err.span) {
566-
errors.push((import, err));
566+
errors.push((*import, err));
567567
prev_root_id = import.root_id;
568568
}
569-
} else if is_indeterminate {
570-
let path = import_path_to_string(
571-
&import.module_path.iter().map(|seg| seg.ident).collect::<Vec<_>>(),
572-
&import.kind,
573-
import.span,
574-
);
575-
let err = UnresolvedImportError {
576-
span: import.span,
577-
label: None,
578-
note: None,
579-
suggestion: None,
580-
candidates: None,
581-
};
582-
// FIXME: there should be a better way of doing this than
583-
// formatting this as a string then checking for `::`
584-
if path.contains("::") {
585-
errors.push((import, err))
586-
}
569+
}
570+
}
571+
572+
if !errors.is_empty() {
573+
self.throw_unresolved_import_error(errors);
574+
return;
575+
}
576+
577+
for import in &indeterminate_imports {
578+
let path = import_path_to_string(
579+
&import.module_path.iter().map(|seg| seg.ident).collect::<Vec<_>>(),
580+
&import.kind,
581+
import.span,
582+
);
583+
let err = UnresolvedImportError {
584+
span: import.span,
585+
label: None,
586+
note: None,
587+
suggestion: None,
588+
candidates: None,
589+
};
590+
// FIXME: there should be a better way of doing this than
591+
// formatting this as a string then checking for `::`
592+
if path.contains("::") {
593+
errors.push((*import, err))
587594
}
588595
}
589596

‎compiler/rustc_target/src/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1300,6 +1300,7 @@ supported_targets! {
13001300
("armv7-linux-androideabi", armv7_linux_androideabi),
13011301
("thumbv7neon-linux-androideabi", thumbv7neon_linux_androideabi),
13021302
("aarch64-linux-android", aarch64_linux_android),
1303+
("riscv64-linux-android", riscv64_linux_android),
13031304

13041305
("aarch64-unknown-freebsd", aarch64_unknown_freebsd),
13051306
("armv6-unknown-freebsd", armv6_unknown_freebsd),

‎compiler/rustc_target/src/spec/riscv64_linux_android.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
use crate::spec::{CodeModel, SanitizerSet, Target, TargetOptions};
2+
3+
pub fn target() -> Target {
4+
Target {
5+
llvm_target: "riscv64-linux-android".into(),
6+
pointer_width: 64,
7+
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
8+
arch: "riscv64".into(),
9+
options: TargetOptions {
10+
code_model: Some(CodeModel::Medium),
11+
cpu: "generic-rv64".into(),
12+
features: "+m,+a,+f,+d,+c".into(),
13+
llvm_abiname: "lp64d".into(),
14+
supported_sanitizers: SanitizerSet::ADDRESS,
15+
max_atomic_width: Some(64),
16+
..super::android_base::opts()
17+
},
18+
}
19+
}

‎config.example.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,6 @@ changelog-seen = 2
690690
# Build compiler with the optimization enabled and -Zvalidate-mir, currently only for `std`
691691
#validate-mir-opts = 3
692692

693-
# Copy the linker, DLLs, and various libraries from MinGW into the rustc toolchain.
694-
# Only applies when the host or target is pc-windows-gnu.
695-
#include-mingw-linker = true
696-
697693
# =============================================================================
698694
# Options for specific targets
699695
#
@@ -844,3 +840,7 @@ changelog-seen = 2
844840
#
845841
# Available options: fast, balanced, best
846842
#compression-profile = "fast"
843+
844+
# Copy the linker, DLLs, and various libraries from MinGW into the rustc toolchain.
845+
# Only applies when the host or target is pc-windows-gnu.
846+
#include-mingw-linker = true

‎library/alloc/tests/string.rs

+46-2
Original file line numberDiff line numberDiff line change
@@ -368,29 +368,73 @@ fn remove_bad() {
368368

369369
#[test]
370370
fn test_remove_matches() {
371+
// test_single_pattern_occurrence
371372
let mut s = "abc".to_string();
372-
373373
s.remove_matches('b');
374374
assert_eq!(s, "ac");
375+
// repeat_test_single_pattern_occurrence
375376
s.remove_matches('b');
376377
assert_eq!(s, "ac");
377378

379+
// test_single_character_pattern
378380
let mut s = "abcb".to_string();
379-
380381
s.remove_matches('b');
381382
assert_eq!(s, "ac");
382383

384+
// test_pattern_with_special_characters
383385
let mut s = "ศไทย中华Việt Nam; foobarศ".to_string();
384386
s.remove_matches('ศ');
385387
assert_eq!(s, "ไทย中华Việt Nam; foobar");
386388

389+
// test_pattern_empty_text_and_pattern
387390
let mut s = "".to_string();
388391
s.remove_matches("");
389392
assert_eq!(s, "");
390393

394+
// test_pattern_empty_text
395+
let mut s = "".to_string();
396+
s.remove_matches("something");
397+
assert_eq!(s, "");
398+
399+
// test_empty_pattern
400+
let mut s = "Testing with empty pattern.".to_string();
401+
s.remove_matches("");
402+
assert_eq!(s, "Testing with empty pattern.");
403+
404+
// test_multiple_consecutive_patterns_1
391405
let mut s = "aaaaa".to_string();
392406
s.remove_matches('a');
393407
assert_eq!(s, "");
408+
409+
// test_multiple_consecutive_patterns_2
410+
let mut s = "Hello **world****today!**".to_string();
411+
s.remove_matches("**");
412+
assert_eq!(s, "Hello worldtoday!");
413+
414+
// test_case_insensitive_pattern
415+
let mut s = "CASE ** SeNsItIvE ** PaTtErN.".to_string();
416+
s.remove_matches("sEnSiTiVe");
417+
assert_eq!(s, "CASE ** SeNsItIvE ** PaTtErN.");
418+
419+
// test_pattern_with_digits
420+
let mut s = "123 ** 456 ** 789".to_string();
421+
s.remove_matches("**");
422+
assert_eq!(s, "123 456 789");
423+
424+
// test_pattern_occurs_after_empty_string
425+
let mut s = "abc X defXghi".to_string();
426+
s.remove_matches("X");
427+
assert_eq!(s, "abc defghi");
428+
429+
// test_large_pattern
430+
let mut s = "aaaXbbbXcccXdddXeee".to_string();
431+
s.remove_matches("X");
432+
assert_eq!(s, "aaabbbcccdddeee");
433+
434+
// test_pattern_at_multiple_positions
435+
let mut s = "Pattern ** found ** multiple ** times ** in ** text.".to_string();
436+
s.remove_matches("**");
437+
assert_eq!(s, "Pattern found multiple times in text.");
394438
}
395439

396440
#[test]

‎library/portable-simd/crates/core_simd/examples/dot_product.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub fn dot_prod_simd_4(a: &[f32], b: &[f32]) -> f32 {
130130
}
131131

132132
// This version allocates a single `XMM` register for accumulation, and the folds don't allocate on top of that.
133-
// Notice the the use of `mul_add`, which can do a multiply and an add operation ber iteration.
133+
// Notice the use of `mul_add`, which can do a multiply and an add operation ber iteration.
134134
pub fn dot_prod_simd_5(a: &[f32], b: &[f32]) -> f32 {
135135
a.array_chunks::<4>()
136136
.map(|&a| f32x4::from_array(a))

‎library/std/src/os/android/raw.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ mod arch {
8989
}
9090
}
9191

92-
#[cfg(target_arch = "aarch64")]
92+
#[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
9393
mod arch {
9494
use crate::os::raw::{c_int, c_long, c_uint, c_ulong};
9595
use crate::os::unix::raw::{gid_t, uid_t};

‎library/test/src/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ impl TestDesc {
224224
}
225225
}
226226

227-
/// Returns None for ignored test or that that are just run, otherwise give a description of the type of test.
227+
/// Returns None for ignored test or tests that are just run, otherwise returns a description of the type of test.
228228
/// Descriptions include "should panic", "compile fail" and "compile".
229229
pub fn test_mode(&self) -> Option<&'static str> {
230230
if self.ignore {

‎src/bootstrap/setup.rs

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ static SETTINGS_HASHES: &[&str] = &[
3232
"56e7bf011c71c5d81e0bf42e84938111847a810eee69d906bba494ea90b51922",
3333
"af1b5efe196aed007577899db9dae15d6dbc923d6fa42fa0934e68617ba9bbe0",
3434
"3468fea433c25fff60be6b71e8a215a732a7b1268b6a83bf10d024344e140541",
35+
"47d227f424bf889b0d899b9cc992d5695e1b78c406e183cd78eafefbe5488923",
3536
];
3637
static RUST_ANALYZER_SETTINGS: &str = include_str!("../etc/rust_analyzer_settings.json");
3738

‎src/doc/rustc/src/platform-support.md

+1
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ target | std | host | notes
309309
`riscv64gc-unknown-linux-musl` | | | RISC-V Linux (kernel 4.20, musl 1.2.0)
310310
[`riscv64gc-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | RISC-V NetBSD
311311
[`riscv64gc-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | OpenBSD/riscv64
312+
[`riscv64-linux-android`](platform-support/android.md) | | | RISC-V 64-bit Android
312313
`s390x-unknown-linux-musl` | | | S390x Linux (kernel 3.2, MUSL)
313314
`sparc-unknown-linux-gnu` | ✓ | | 32-bit SPARC Linux
314315
[`sparc64-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/sparc64

‎src/etc/rust_analyzer_settings.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,8 @@
3131
"--json-output"
3232
],
3333
"rust-analyzer.cargo.sysrootSrc": "./library",
34-
"rust-analyzer.rustc.source": "./Cargo.toml"
34+
"rust-analyzer.rustc.source": "./Cargo.toml",
35+
"rust-analyzer.cargo.extraEnv": {
36+
"RUSTC_BOOTSTRAP": "1"
37+
}
3538
}

‎src/tools/miri/src/mono_hash_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! otherwise mutated. We also box items in the map. This means we can safely provide
33
//! shared references into existing items in the `FxHashMap`, because they will not be dropped
44
//! (from being removed) or moved (because they are boxed).
5-
//! The API is is completely tailored to what `memory.rs` needs. It is still in
5+
//! The API is completely tailored to what `memory.rs` needs. It is still in
66
//! a separate file to minimize the amount of code that has to care about the unsafety.
77
88
use std::borrow::Borrow;

‎tests/run-make/dump-ice-to-disk/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include ../tools.mk
33
# ignore-windows
44

55
export RUSTC := $(RUSTC_ORIGINAL)
6+
export LD_LIBRARY_PATH := $(HOST_RPATH_DIR)
67
export TMPDIR := $(TMPDIR)
78

89
all:

‎tests/run-make/short-ice/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include ../tools.mk
33
# ignore-windows
44

55
export RUSTC := $(RUSTC_ORIGINAL)
6+
export LD_LIBRARY_PATH := $(HOST_RPATH_DIR)
67
export TMPDIR := $(TMPDIR)
78

89
all:

‎tests/ui/imports/issue-81413.rs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
pub const ITEM: Item = Item;
2+
3+
pub struct Item;
4+
5+
pub fn item() {}
6+
7+
pub use doesnt_exist::*;
8+
//~^ ERROR unresolved import `doesnt_exist`
9+
mod a {
10+
use crate::{item, Item, ITEM};
11+
}
12+
13+
mod b {
14+
use crate::item;
15+
use crate::Item;
16+
use crate::ITEM;
17+
}
18+
19+
mod c {
20+
use crate::item;
21+
}
22+
23+
fn main() {}

‎tests/ui/imports/issue-81413.stderr

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0432]: unresolved import `doesnt_exist`
2+
--> $DIR/issue-81413.rs:7:9
3+
|
4+
LL | pub use doesnt_exist::*;
5+
| ^^^^^^^^^^^^ maybe a missing crate `doesnt_exist`?
6+
|
7+
= help: consider adding `extern crate doesnt_exist` to use the `doesnt_exist` crate
8+
9+
error: aborting due to previous error
10+
11+
For more information about this error, try `rustc --explain E0432`.

0 commit comments

Comments
 (0)