Skip to content

Commit 6963d0f

Browse files
committed
Auto merge of rust-lang#128658 - matthiaskrgr:rollup-6w3xsco, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#127655 (turn `invalid_type_param_default` into a `FutureReleaseErrorReportInDeps`) - rust-lang#127974 (force compiling std from source if modified) - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.) - rust-lang#128309 (Implement cursors for `BTreeSet`) - rust-lang#128500 (Add test for updating enum discriminant through pointer) - rust-lang#128630 (docs(resolve): more explain about `target`) - rust-lang#128631 (handle crates when they are not specified for std docs) - rust-lang#128638 (run-make: enable msvc for `link-dedup`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 176e545 + 3300a53 commit 6963d0f

File tree

21 files changed

+806
-52
lines changed

21 files changed

+806
-52
lines changed

compiler/rustc_feature/src/removed.rs

+3
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ declare_features! (
8282
/// Allows the use of `#[derive(Anything)]` as sugar for `#[derive_Anything]`.
8383
(removed, custom_derive, "1.32.0", Some(29644),
8484
Some("subsumed by `#[proc_macro_derive]`")),
85+
/// Allows default type parameters to influence type inference.
86+
(removed, default_type_parameter_fallback, "CURRENT_RUSTC_VERSION", Some(27336),
87+
Some("never properly implemented; requires significant design work")),
8588
/// Allows using `#[doc(keyword = "...")]`.
8689
(removed, doc_keyword, "1.28.0", Some(51315),
8790
Some("merged into `#![feature(rustdoc_internals)]`")),

compiler/rustc_feature/src/unstable.rs

-2
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,6 @@ declare_features! (
431431
(unstable, custom_test_frameworks, "1.30.0", Some(50297)),
432432
/// Allows declarative macros 2.0 (`macro`).
433433
(unstable, decl_macro, "1.17.0", Some(39412)),
434-
/// Allows default type parameters to influence type inference.
435-
(unstable, default_type_parameter_fallback, "1.3.0", Some(27336)),
436434
/// Allows using `#[deprecated_safe]` to deprecate the safeness of a function or trait
437435
(unstable, deprecated_safe, "1.61.0", Some(94978)),
438436
/// Allows having using `suggestion` in the `#[deprecated]` attribute.

compiler/rustc_hir_analysis/src/collect/generics_of.rs

-2
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,6 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
338338
if default.is_some() {
339339
match allow_defaults {
340340
Defaults::Allowed => {}
341-
Defaults::FutureCompatDisallowed
342-
if tcx.features().default_type_parameter_fallback => {}
343341
Defaults::FutureCompatDisallowed => {
344342
tcx.node_span_lint(
345343
lint::builtin::INVALID_TYPE_PARAM_DEFAULT,

compiler/rustc_lint_defs/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ declare_lint! {
12671267
Deny,
12681268
"type parameter default erroneously allowed in invalid location",
12691269
@future_incompatible = FutureIncompatibleInfo {
1270-
reason: FutureIncompatibilityReason::FutureReleaseErrorDontReportInDeps,
1270+
reason: FutureIncompatibilityReason::FutureReleaseErrorReportInDeps,
12711271
reference: "issue #36887 <https://github.com/rust-lang/rust/issues/36887>",
12721272
};
12731273
}

compiler/rustc_resolve/src/imports.rs

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ pub(crate) enum ImportKind<'a> {
4848
/// `source` in `use prefix::source as target`.
4949
source: Ident,
5050
/// `target` in `use prefix::source as target`.
51+
/// It will directly use `source` when the format is `use prefix::source`.
5152
target: Ident,
5253
/// Bindings to which `source` refers to.
5354
source_bindings: PerNS<Cell<Result<NameBinding<'a>, Determinacy>>>,

config.example.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@
472472
# This is mostly useful for tools; if you have changes to `compiler/` or `library/` they will be ignored.
473473
#
474474
# Set this to "if-unchanged" to only download if the compiler and standard library have not been modified.
475-
# Set this to `true` to download unconditionally (useful if e.g. you are only changing doc-comments).
475+
# Set this to `true` to download unconditionally. This is useful if you are working on tools, doc-comments,
476+
# or library (you will be able to build the standard library without needing to build the compiler).
476477
#download-rustc = false
477478

478479
# Number of codegen units to use for each compiler invocation. A value of 0

0 commit comments

Comments
 (0)