Resolve merge conflicts with #10330#10386

Closed

kennystrawnmusic wants to merge 15 commits intorust-lang:masterfrom kennystrawnmusic:support-per-pkg-target-w-buildstd

+116-55

Commits on Jan 29, 2022

Commits on Feb 12, 2022

Abstract explicit_kinds from generate_targets

fee1-dead
authored and
kennystrawnmusic
committed
Adopt std roots generations to use explicit_kinds method

fee1-dead
authored and
kennystrawnmusic
committed
Remove obsolete error and unused var

fee1-dead
authored and
kennystrawnmusic
committed
Add per-package-target test

fee1-dead
authored and
kennystrawnmusic
committed
Run rustfmt

fee1-dead
authored and
kennystrawnmusic
committed
Apply indentation nits

fee1-dead
authored and
kennystrawnmusic
committed
Move comments

fee1-dead
authored and
kennystrawnmusic
committed
Resolve merge conflicts with rust-lang#10330
kennystrawnmusic
committed