diff options
| author | bors <bors@rust-lang.org> | 2025-06-20 09:59:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-20 09:59:20 +0000 |
| commit | 3b97f1308ff72016a4aaa93fbe6d09d4d6427815 (patch) | |
| tree | 0ffeb6e134e7925baa8359c1f0941a65a5de4456 /src | |
| parent | 18491d5be00eb3ed2f1ccee2ac5b792694f2a7a0 (diff) | |
| parent | bb72cc7da830084c5f15f05999fd0a50b6bb7a40 (diff) | |
| download | rust-3b97f1308ff72016a4aaa93fbe6d09d4d6427815.tar.gz rust-3b97f1308ff72016a4aaa93fbe6d09d4d6427815.zip | |
Auto merge of #142770 - tgross35:rollup-w74w39t, r=tgross35
Rollup of 8 pull requests Successful merges: - rust-lang/rust#138291 (rewrite `optimize` attribute to use new attribute parsing infrastructure) - rust-lang/rust#140920 (Extract some shared code from codegen backend target feature handling) - rust-lang/rust#141990 (Implement send_signal for unix child processes) - rust-lang/rust#142668 (vec_deque/fmt/vec tests: remove static mut) - rust-lang/rust#142687 (Reduce uses of `hir_crate`.) - rust-lang/rust#142699 (Update books) - rust-lang/rust#142714 (add comment to `src/bootstrap/build.rs`) - rust-lang/rust#142753 (Update library dependencies) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/build.rs | 1 | ||||
| m--------- | src/doc/book | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| -rw-r--r-- | src/librustdoc/core.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/json/mod.rs | 5 | ||||
| -rw-r--r-- | src/rustdoc-json-types/lib.rs | 4 |
7 files changed, 5 insertions, 7 deletions
diff --git a/src/bootstrap/build.rs b/src/bootstrap/build.rs index e0e32d31353..d9810e899a0 100644 --- a/src/bootstrap/build.rs +++ b/src/bootstrap/build.rs @@ -1,6 +1,7 @@ use std::env; fn main() { + // this is needed because `HOST` is only available to build scripts. let host = env::var("HOST").unwrap(); println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rustc-env=BUILD_TRIPLE={host}"); diff --git a/src/doc/book b/src/doc/book -Subproject 4433c9f0cad8460bee05ede040587f8a1fa3f1d +Subproject 8a6d44e45b7b564eeb6bae30507e1fbac439d72 diff --git a/src/doc/reference b/src/doc/reference -Subproject d4c66b346f4b72d29e70390a3fa3ea7d4e064db +Subproject 50fc1628f36563958399123829c73755fa7a842 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject 9baa9e863116cb9524a177d5a5c475baac18928 +Subproject 05c7d8bae65f23a1837430c5a19be129d414f5e diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index 204f8decffc..d73600a4636 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -387,8 +387,6 @@ pub(crate) fn run_global_ctxt( ctxt.external_traits.insert(sized_trait_did, sized_trait); } - debug!("crate: {:?}", tcx.hir_crate(())); - let mut krate = tcx.sess.time("clean_crate", || clean::krate(&mut ctxt)); if krate.module.doc_value().is_empty() { diff --git a/src/librustdoc/json/mod.rs b/src/librustdoc/json/mod.rs index 2feadce26d0..29c63a391e2 100644 --- a/src/librustdoc/json/mod.rs +++ b/src/librustdoc/json/mod.rs @@ -18,7 +18,6 @@ use rustc_data_structures::fx::FxHashSet; use rustc_hir::def_id::{DefId, DefIdSet}; use rustc_middle::ty::TyCtxt; use rustc_session::Session; -use rustc_session::features::StabilityExt; use rustc_span::def_id::LOCAL_CRATE; use rustdoc_json_types as types; // It's important to use the FxHashMap from rustdoc_json_types here, instead of @@ -148,7 +147,7 @@ fn target(sess: &rustc_session::Session) -> types::Target { .copied() .filter(|(_, stability, _)| { // Describe only target features which the user can toggle - stability.is_toggle_permitted(sess).is_ok() + stability.toggle_allowed().is_ok() }) .map(|(name, stability, implied_features)| { types::TargetFeature { @@ -164,7 +163,7 @@ fn target(sess: &rustc_session::Session) -> types::Target { // Imply only target features which the user can toggle feature_stability .get(name) - .map(|stability| stability.is_toggle_permitted(sess).is_ok()) + .map(|stability| stability.toggle_allowed().is_ok()) .unwrap_or(false) }) .map(String::from) diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs index 1f93895ae07..d5de43feb58 100644 --- a/src/rustdoc-json-types/lib.rs +++ b/src/rustdoc-json-types/lib.rs @@ -37,8 +37,8 @@ pub type FxHashMap<K, V> = HashMap<K, V>; // re-export for use in src/librustdoc // will instead cause conflicts. See #94591 for more. (This paragraph and the "Latest feature" line // are deliberately not in a doc comment, because they need not be in public docs.) // -// Latest feature: Pretty printing of inline attributes changed -pub const FORMAT_VERSION: u32 = 48; +// Latest feature: Pretty printing of optimize attributes changed +pub const FORMAT_VERSION: u32 = 49; /// The root of the emitted JSON blob. /// |
