Skip to content

Commit 0b4f423

Browse files
borsbors
committed
Auto merge of #128519 - tgross35:rollup-cq66zmj, r=tgross35
Rollup of 5 pull requests Successful merges: - #123994 (Use Default visibility for rustc-generated C symbol declarations) - #126818 (Better handle suggestions for the already present code and fix some suggestions) - #127624 (Migrate and rename `issue-47551`, `issue-35164` and `issue-69368` `run-make` tests to rmake) - #128361 (Migrate `link-cfg` and `rustdoc-default-output` `run-make` tests to rmake) - #128436 (Update sysinfo version to 0.31.2) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8e86c95 + c5289b4 commit 0b4f423

File tree

41 files changed

+380
-197
lines changed

Some content is hidden

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

41 files changed

+380
-197
lines changed

‎Cargo.lock

+64-23
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ dependencies = [
771771
"tracing-subscriber",
772772
"unified-diff",
773773
"walkdir",
774-
"windows",
774+
"windows 0.52.0",
775775
]
776776

777777
[[package]]
@@ -1713,7 +1713,7 @@ dependencies = [
17131713
"iana-time-zone-haiku",
17141714
"js-sys",
17151715
"wasm-bindgen",
1716-
"windows-core",
1716+
"windows-core 0.52.0",
17171717
]
17181718

17191719
[[package]]
@@ -2436,15 +2436,6 @@ dependencies = [
24362436
"windows-sys 0.52.0",
24372437
]
24382438

2439-
[[package]]
2440-
name = "ntapi"
2441-
version = "0.4.1"
2442-
source = "registry+https://github.com/rust-lang/crates.io-index"
2443-
checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
2444-
dependencies = [
2445-
"winapi",
2446-
]
2447-
24482439
[[package]]
24492440
name = "nu-ansi-term"
24502441
version = "0.46.0"
@@ -3717,7 +3708,7 @@ dependencies = [
37173708
"thorin-dwp",
37183709
"tracing",
37193710
"wasm-encoder 0.210.0",
3720-
"windows",
3711+
"windows 0.52.0",
37213712
]
37223713

37233714
[[package]]
@@ -3774,7 +3765,7 @@ dependencies = [
37743765
"tempfile",
37753766
"thin-vec",
37763767
"tracing",
3777-
"windows",
3768+
"windows 0.52.0",
37783769
]
37793770

37803771
[[package]]
@@ -3835,7 +3826,7 @@ dependencies = [
38353826
"shlex",
38363827
"time",
38373828
"tracing",
3838-
"windows",
3829+
"windows 0.52.0",
38393830
]
38403831

38413832
[[package]]
@@ -3886,7 +3877,7 @@ dependencies = [
38863877
"termcolor",
38873878
"termize",
38883879
"tracing",
3889-
"windows",
3880+
"windows 0.52.0",
38903881
]
38913882

38923883
[[package]]
@@ -4607,7 +4598,7 @@ dependencies = [
46074598
"smallvec",
46084599
"termize",
46094600
"tracing",
4610-
"windows",
4601+
"windows 0.52.0",
46114602
]
46124603

46134604
[[package]]
@@ -5365,16 +5356,13 @@ dependencies = [
53655356

53665357
[[package]]
53675358
name = "sysinfo"
5368-
version = "0.30.12"
5359+
version = "0.31.2"
53695360
source = "registry+https://github.com/rust-lang/crates.io-index"
5370-
checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
5361+
checksum = "d4115055da5f572fff541dd0c4e61b0262977f453cc9fe04be83aba25a89bdab"
53715362
dependencies = [
5372-
"cfg-if",
53735363
"core-foundation-sys",
53745364
"libc",
5375-
"ntapi",
5376-
"once_cell",
5377-
"windows",
5365+
"windows 0.57.0",
53785366
]
53795367

53805368
[[package]]
@@ -6299,7 +6287,17 @@ version = "0.52.0"
62996287
source = "registry+https://github.com/rust-lang/crates.io-index"
63006288
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
63016289
dependencies = [
6302-
"windows-core",
6290+
"windows-core 0.52.0",
6291+
"windows-targets 0.52.5",
6292+
]
6293+
6294+
[[package]]
6295+
name = "windows"
6296+
version = "0.57.0"
6297+
source = "registry+https://github.com/rust-lang/crates.io-index"
6298+
checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
6299+
dependencies = [
6300+
"windows-core 0.57.0",
63036301
"windows-targets 0.52.5",
63046302
]
63056303

@@ -6326,12 +6324,55 @@ dependencies = [
63266324
"windows-targets 0.52.5",
63276325
]
63286326

6327+
[[package]]
6328+
name = "windows-core"
6329+
version = "0.57.0"
6330+
source = "registry+https://github.com/rust-lang/crates.io-index"
6331+
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
6332+
dependencies = [
6333+
"windows-implement",
6334+
"windows-interface",
6335+
"windows-result",
6336+
"windows-targets 0.52.5",
6337+
]
6338+
6339+
[[package]]
6340+
name = "windows-implement"
6341+
version = "0.57.0"
6342+
source = "registry+https://github.com/rust-lang/crates.io-index"
6343+
checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
6344+
dependencies = [
6345+
"proc-macro2",
6346+
"quote",
6347+
"syn 2.0.67",
6348+
]
6349+
6350+
[[package]]
6351+
name = "windows-interface"
6352+
version = "0.57.0"
6353+
source = "registry+https://github.com/rust-lang/crates.io-index"
6354+
checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
6355+
dependencies = [
6356+
"proc-macro2",
6357+
"quote",
6358+
"syn 2.0.67",
6359+
]
6360+
63296361
[[package]]
63306362
name = "windows-metadata"
63316363
version = "0.58.0"
63326364
source = "registry+https://github.com/rust-lang/crates.io-index"
63336365
checksum = "2e837f3c3012cfe9e7086302a93f441a7999439be1ad4c530d55d2f6d2921809"
63346366

6367+
[[package]]
6368+
name = "windows-result"
6369+
version = "0.1.2"
6370+
source = "registry+https://github.com/rust-lang/crates.io-index"
6371+
checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
6372+
dependencies = [
6373+
"windows-targets 0.52.5",
6374+
]
6375+
63356376
[[package]]
63366377
name = "windows-sys"
63376378
version = "0.48.0"

‎compiler/rustc_codegen_llvm/src/declare.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,16 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
8383
unnamed: llvm::UnnamedAddr,
8484
fn_type: &'ll Type,
8585
) -> &'ll Value {
86-
// Declare C ABI functions with the visibility used by C by default.
87-
let visibility = if self.tcx.sess.default_hidden_visibility() {
88-
llvm::Visibility::Hidden
89-
} else {
90-
llvm::Visibility::Default
91-
};
92-
93-
declare_raw_fn(self, name, llvm::CCallConv, unnamed, visibility, fn_type)
86+
// Declare C ABI functions with Default visibility to allow them to link
87+
// dynamically with shared object-provided symbols later on. This is
88+
// needed to link intrinsic-generated calls to e.g. libc.so symbols like
89+
// memcmp.
90+
declare_raw_fn(self, name, llvm::CCallConv, unnamed, llvm::Visibility::Default, fn_type)
9491
}
9592

9693
/// Declare an entry Function
9794
///
98-
/// The ABI of this function can change depending on the target (although for now the same as
99-
/// `declare_cfn`)
95+
/// The ABI of this function can change depending on the target.
10096
///
10197
/// If there’s a value with the same name already declared, the function will
10298
/// update the declaration and return existing Value instead.

‎compiler/rustc_errors/src/emitter.rs

+19-2
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,10 @@ impl HumanEmitter {
17671767
debug!(?suggestions);
17681768

17691769
if suggestions.is_empty() {
1770-
// Suggestions coming from macros can have malformed spans. This is a heavy handed
1770+
// Here we check if there are suggestions that have actual code changes. We sometimes
1771+
// suggest the same code that is already there, instead of changing how we produce the
1772+
// suggestions and filtering there, we just don't emit the suggestion.
1773+
// Suggestions coming from macros can also have malformed spans. This is a heavy handed
17711774
// approach to avoid ICEs by ignoring the suggestion outright.
17721775
return Ok(());
17731776
}
@@ -2046,7 +2049,9 @@ impl HumanEmitter {
20462049
assert!(underline_start >= 0 && underline_end >= 0);
20472050
let padding: usize = max_line_num_len + 3;
20482051
for p in underline_start..underline_end {
2049-
if let DisplaySuggestion::Underline = show_code_change {
2052+
if let DisplaySuggestion::Underline = show_code_change
2053+
&& is_different(sm, &part.snippet, part.span)
2054+
{
20502055
// If this is a replacement, underline with `~`, if this is an addition
20512056
// underline with `+`.
20522057
buffer.putc(
@@ -2824,6 +2829,18 @@ impl Style {
28242829
}
28252830
}
28262831

2832+
/// Whether the original and suggested code are the same.
2833+
pub fn is_different(sm: &SourceMap, suggested: &str, sp: Span) -> bool {
2834+
let found = match sm.span_to_snippet(sp) {
2835+
Ok(snippet) => snippet,
2836+
Err(e) => {
2837+
warn!(error = ?e, "Invalid span {:?}", sp);
2838+
return true;
2839+
}
2840+
};
2841+
found != suggested
2842+
}
2843+
28272844
/// Whether the original and suggested code are visually similar enough to warrant extra wording.
28282845
pub fn is_case_difference(sm: &SourceMap, suggested: &str, sp: Span) -> bool {
28292846
// FIXME: this should probably be extended to also account for `FO0` → `FOO` and unicode.

‎compiler/rustc_errors/src/lib.rs

+16-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub use diagnostic_impls::{
5050
IndicateAnonymousLifetime, SingleLabelManySpans,
5151
};
5252
pub use emitter::ColorConfig;
53-
use emitter::{is_case_difference, DynEmitter, Emitter};
53+
use emitter::{is_case_difference, is_different, DynEmitter, Emitter};
5454
use registry::Registry;
5555
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
5656
use rustc_data_structures::stable_hasher::{Hash128, StableHasher};
@@ -357,10 +357,16 @@ impl CodeSuggestion {
357357
_ => 1,
358358
})
359359
.sum();
360-
line_highlight.push(SubstitutionHighlight {
361-
start: (cur_lo.col.0 as isize + acc) as usize,
362-
end: (cur_lo.col.0 as isize + acc + len) as usize,
363-
});
360+
if !is_different(sm, &part.snippet, part.span) {
361+
// Account for cases where we are suggesting the same code that's already
362+
// there. This shouldn't happen often, but in some cases for multipart
363+
// suggestions it's much easier to handle it here than in the origin.
364+
} else {
365+
line_highlight.push(SubstitutionHighlight {
366+
start: (cur_lo.col.0 as isize + acc) as usize,
367+
end: (cur_lo.col.0 as isize + acc + len) as usize,
368+
});
369+
}
364370
buf.push_str(&part.snippet);
365371
let cur_hi = sm.lookup_char_pos(part.span.hi());
366372
// Account for the difference between the width of the current code and the
@@ -392,7 +398,11 @@ impl CodeSuggestion {
392398
while buf.ends_with('\n') {
393399
buf.pop();
394400
}
395-
Some((buf, substitution.parts, highlights, only_capitalization))
401+
if highlights.iter().all(|parts| parts.is_empty()) {
402+
None
403+
} else {
404+
Some((buf, substitution.parts, highlights, only_capitalization))
405+
}
396406
})
397407
.collect()
398408
}

0 commit comments

Comments
 (0)