Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: roll nightly to 2022-10-07 #335

Merged
merged 16 commits into from
Nov 16, 2022
Merged

chore: roll nightly to 2022-10-07 #335

merged 16 commits into from
Nov 16, 2022

Conversation

hawkw
Copy link
Owner

@hawkw hawkw commented Oct 9, 2022

This commit updates Mycelium's pinned nightly version to Rust nightly-2022-10-09. Unfortunately, this currently doesn't work, due to linker errors when linking with the bootloader (see rust-osdev/bootloader#271).

@hawkw
Copy link
Owner Author

hawkw commented Oct 9, 2022

Looks like the linker error is due to a rustc regression introduced in nightly-2022-10-08 where the compiler started eating pre-link-args in target files: rust-lang/rust#101988 (comment). PR rust-lang/rust#102836 should fix this.

For now, I'll try pinning our nightly to 2022-10-07.

@hawkw hawkw changed the title chore: roll nightly to 2022-10-09 chore: roll nightly to 2022-10-07 Oct 9, 2022
@hawkw hawkw marked this pull request as ready for review October 9, 2022 23:53
@hawkw hawkw enabled auto-merge (squash) October 9, 2022 23:55
@hawkw hawkw disabled auto-merge November 5, 2022 16:57
@hawkw hawkw enabled auto-merge (rebase) November 5, 2022 16:59
hawkw added a commit that referenced this pull request Nov 5, 2022
This commit updates Mycelium's pinned nightly version to Rust
`nightly-2022-10-09`. Unfortunately, this currently doesn't work, due to
linker errors when linking with the bootloader (see
rust-osdev/bootloader#271).
hawkw added a commit that referenced this pull request Nov 5, 2022
hawkw added a commit that referenced this pull request Nov 5, 2022
hawkw added a commit that referenced this pull request Nov 5, 2022
hawkw added a commit that referenced this pull request Nov 5, 2022
@hawkw
Copy link
Owner Author

hawkw commented Nov 5, 2022

The only thing that's breaking here is RustDoc, which is weird because it works for me locally...

@hawkw
Copy link
Owner Author

hawkw commented Nov 5, 2022

Ah, looks like the RustDoc panic is rust-lang/rust#103463

@hawkw
Copy link
Owner Author

hawkw commented Nov 5, 2022

Hmm, the fix for the RustDoc issue seems to have merged 3 days ago (rust-lang/rust#103649), so I'm surprised it's not in yesterday's nightly?

@hawkw
Copy link
Owner Author

hawkw commented Nov 5, 2022

Issue appears to be related to building the docs for the acpi crate:

DEBUG rustdoc::passes::collect_intra_doc_links combined_docs=Unmap the given physical mapping. This is called when a `PhysicalMapping` is dropped, you should **not** manually call this.

Note: A reference to the handler used to construct `region` can be acquired by calling [`PhysicalMapping::handler`].

DEBUG rustdoc::passes::collect_intra_doc_links PhysicalMapping::handler resolved to None in namespace MacroNS
DEBUG rustdoc::passes::collect_intra_doc_links PhysicalMapping::handler resolved to None in namespace TypeNS
DEBUG rustdoc::passes::collect_intra_doc_links PhysicalMapping resolved to Some(Def(Struct, DefId(45:12 ~ rsdp[ef1a]::handler::PhysicalMapping))) in namespace TypeNS
DEBUG rustdoc::passes::collect_intra_doc_links looking for associated item named handler for item DefId(45:12 ~ rsdp[ef1a]::handler::PhysicalMapping)
┐rustdoc::passes::collect_intra_doc_links::trait_impls_for ty=acpi::PhysicalMapping<H, T>, module=DefId(45:4 ~ rsdp[ef1a]::handler)
thread 'rustc' panicked at 'no entry found for key', src/librustdoc/passes/collect_intra_doc_links.rs:781:16
stack backtrace:
   0: rust_begin_unwind
             at /rustc/215e3cd218b83b8a3152d84d92f17109253c25e1/library/std/src/panicking.rs:575:5
   1: core::panicking::panic_fmt
             at /rustc/215e3cd218b83b8a3152d84d92f17109253c25e1/library/core/src/panicking.rs:65:14
   2: core::panicking::panic_display
             at /rustc/215e3cd218b83b8a3152d84d92f17109253c25e1/library/core/src/panicking.rs:139:5
   3: core::panicking::panic_str
             at /rustc/215e3cd218b83b8a3152d84d92f17109253c25e1/library/core/src/panicking.rs:123:5
   4: core::option::expect_failed
             at /rustc/215e3cd218b83b8a3152d84d92f17109253c25e1/library/core/src/option.rs:1879:5
   5: rustdoc::passes::collect_intra_doc_links::resolve_associated_trait_item
   6: <rustdoc::passes::collect_intra_doc_links::LinkCollector>::resolve_associated_item
   7: <rustdoc::passes::collect_intra_doc_links::LinkCollector>::resolve
   8: <rustdoc::passes::collect_intra_doc_links::LinkCollector as rustdoc::visit::DocVisitor>::visit_item
   9: rustdoc::passes::collect_intra_doc_links::collect_intra_doc_links
  10: <rustc_session::session::Session>::time::<rustdoc::clean::types::Crate, rustdoc::core::run_global_ctxt::{closure#7}>
  11: rustdoc::core::run_global_ctxt
  12: <rustc_interface::passes::QueryContext>::enter::<rustdoc::main_args::{closure#1}::{closure#0}::{closure#1}, core::result::Result<(), rustc_errors::ErrorGuaranteed>>
  13: <rustc_interface::interface::Compiler>::enter::<rustdoc::main_args::{closure#1}::{closure#0}, core::result::Result<(), rustc_errors::ErrorGuaranteed>>
  14: rustc_span::with_source_map::<core::result::Result<(), rustc_errors::ErrorGuaranteed>, rustc_interface::interface::run_compiler<core::result::Result<(), rustc_errors::ErrorGuaranteed>, rustdoc::main_args::{closure#1}>::{closure#0}::{closure#1}>
  15: <scoped_tls::ScopedKey<rustc_span::SessionGlobals>>::set::<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_errors::ErrorGuaranteed>, rustdoc::main_args::{closure#1}>::{closure#0}, core::result::Result<(), rustc_errors::ErrorGuaranteed>>
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
┘rustdoc::passes::collect_intra_doc_links::trait_impls_for ty=acpi::PhysicalMapping<H, T>, module=DefId(45:4 ~ rsdp[ef1a]::handler)
error: could not document `mycelium-kernel`

hawkw added a commit that referenced this pull request Nov 5, 2022
hawkw added a commit that referenced this pull request Nov 5, 2022
hawkw added a commit that referenced this pull request Nov 5, 2022
hawkw added a commit that referenced this pull request Nov 6, 2022
hawkw added a commit that referenced this pull request Nov 11, 2022
@hawkw
Copy link
Owner Author

hawkw commented Nov 14, 2022

Opened rust-lang/rust#104421, since this appears to be a different panic from the one that was fixed.

Update: looks like that's probably a duplicate of rust-lang/rust#104145, which appears to have a PR open to fix it...hopefully that'll be in the next nightly and we can see if it fixes our issue as well.

hawkw added a commit that referenced this pull request Nov 15, 2022
This appears not to have the fix for rust-lang/rust#104145 yet, as it's
currently on rust-lang/rust@96ddd32,
and the fix was merged in
rust-lang/rust@dc869fc, but I figured
I'd bump anyway. Tomorrow's nightly should be good again!
hawkw added a commit that referenced this pull request Nov 16, 2022
This contains the fix for rust-lang/rust#104145, so our docs build now!
hawkw added a commit that referenced this pull request Nov 16, 2022
This commit updates Mycelium's pinned nightly version to Rust
`nightly-2022-10-09`. Unfortunately, this currently doesn't work, due to
linker errors when linking with the bootloader (see
rust-osdev/bootloader#271).
This appears not to have the fix for rust-lang/rust#104145 yet, as it's
currently on rust-lang/rust@96ddd32,
and the fix was merged in
rust-lang/rust@dc869fc, but I figured
I'd bump anyway. Tomorrow's nightly should be good again!
This contains the fix for rust-lang/rust#104145, so our docs build now!
@hawkw hawkw disabled auto-merge November 16, 2022 17:14
@hawkw hawkw enabled auto-merge (rebase) November 16, 2022 17:14
@hawkw hawkw disabled auto-merge November 16, 2022 17:25
@hawkw hawkw merged commit 0cac3f4 into main Nov 16, 2022
@hawkw hawkw deleted the eliza/nightly-2022-10-09 branch November 16, 2022 17:25
hawkw added a commit that referenced this pull request Nov 16, 2022
This commit updates Mycelium's pinned nightly version to Rust
`nightly-2022-10-09`. Unfortunately, this currently doesn't work, due to
linker errors when linking with the bootloader (see
rust-osdev/bootloader#271).
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
This appears not to have the fix for rust-lang/rust#104145 yet, as it's
currently on rust-lang/rust@96ddd32,
and the fix was merged in
rust-lang/rust@dc869fc, but I figured
I'd bump anyway. Tomorrow's nightly should be good again!
hawkw added a commit that referenced this pull request Nov 16, 2022
This contains the fix for rust-lang/rust#104145, so our docs build now!
hawkw added a commit that referenced this pull request Nov 16, 2022
hawkw added a commit that referenced this pull request Nov 16, 2022
I changed all the crates to use this syntax in #335 when updating, but
I forgot that `cordyceps` has a MSRV. Whoops!
hawkw added a commit that referenced this pull request Nov 16, 2022
I changed all the crates to use this syntax in #335 when updating, but
I forgot that `cordyceps` has a MSRV. Whoops!
hawkw added a commit that referenced this pull request Nov 16, 2022
I changed all the crates to use this syntax in #335 when updating, but
I forgot that `cordyceps` has a MSRV. Whoops!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant