Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b629c85

Browse files
committedJul 26, 2022
Auto merge of #99745 - JohnTitor:rollup-lvrie64, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #98211 (Implement `fs::get_path` for FreeBSD.) - #99353 (Slightly improve mismatched GAT where clause error) - #99593 (Suggest removing the tuple struct field for the unwrapped value) - #99615 (Remove some explicit `self.infcx` for `FnCtxt`, which already derefs into `InferCtxt`) - #99711 (Remove reachable coverage without counters) - #99718 (Avoid `&str`/`Symbol` to `String` conversions) - #99720 (Sync rustc_codegen_cranelift) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents daaae25 + a572f06 commit b629c85

File tree

74 files changed

+844
-551
lines changed

Some content is hidden

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

74 files changed

+844
-551
lines changed
 

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -850,13 +850,11 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
850850
debug!("trait spans found: {:?}", traits);
851851
for span in &traits {
852852
let mut multi_span: MultiSpan = vec![*span].into();
853-
multi_span.push_span_label(
854-
*span,
855-
"this has an implicit `'static` lifetime requirement".to_string(),
856-
);
853+
multi_span
854+
.push_span_label(*span, "this has an implicit `'static` lifetime requirement");
857855
multi_span.push_span_label(
858856
ident.span,
859-
"calling this method introduces the `impl`'s 'static` requirement".to_string(),
857+
"calling this method introduces the `impl`'s 'static` requirement",
860858
);
861859
err.span_note(multi_span, "the used `impl` has a `'static` requirement");
862860
err.span_suggestion_verbose(

‎compiler/rustc_codegen_cranelift/.vscode/settings.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
// source for rustc_* is not included in the rust-src component; disable the errors about this
33
"rust-analyzer.diagnostics.disabled": ["unresolved-extern-crate", "unresolved-macro-call"],
4-
"rust-analyzer.assist.importGranularity": "module",
5-
"rust-analyzer.assist.importEnforceGranularity": true,
6-
"rust-analyzer.assist.importPrefix": "crate",
7-
"rust-analyzer.cargo.runBuildScripts": true,
4+
"rust-analyzer.imports.granularity.enforce": true,
5+
"rust-analyzer.imports.granularity.group": "module",
6+
"rust-analyzer.imports.prefix": "crate",
87
"rust-analyzer.cargo.features": ["unstable-features"],
98
"rust-analyzer.linkedProjects": [
109
"./Cargo.toml",

0 commit comments

Comments
 (0)
Please sign in to comment.