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.

Sign up for GitHub

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

Jump to bottom

Refactor BuildContext #8068

Merged
merged 8 commits into from
Apr 19, 2020
Merged

Refactor BuildContext #8068

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98b6f81
Wrap Package/Target in Rc.
ehuss Mar 20, 2020
e0bd9e2
bcx reorg
ehuss Mar 24, 2020
fbd34a6
Hide `Rc<Package>` under `Package`
alexcrichton Apr 5, 2020
45d4957
Make `Unit` an owned value
alexcrichton Apr 6, 2020
c85ed04
Remove lifetime from `Unit`
alexcrichton Apr 9, 2020
7b9f56b
Re-add code removed for debugging
alexcrichton Apr 9, 2020
e06a911
Run rustfmt
alexcrichton Apr 9, 2020
df5cb70
A few final minor fixes for bcx reorg.
ehuss Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
A few final minor fixes for bcx reorg.
  • Loading branch information
@ehuss
ehuss committed Apr 19, 2020
commit df5cb70e7bc8872216af736f108f5a959a6d2302
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/fingerprint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ fn calculate_normal(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Finger
let target_root = target_root(cx);
let local = if unit.mode.is_doc() {
// rustdoc does not have dep-info files.
let fingerprint = pkg_fingerprint(cx.bcx, unit.pkg)?;
let fingerprint = pkg_fingerprint(cx.bcx, &unit.pkg)?;
vec![LocalFingerprint::Precalculated(fingerprint)]
} else {
let dep_info = dep_info_loc(cx, unit);
Expand Down
4 changes: 0 additions & 4 deletions src/cargo/core/manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,6 @@ impl Manifest {
pub fn targets(&self) -> &[Target] {
&self.targets
}
pub fn targets_mut(&mut self) -> &mut [Target] {
// TOOD: Remove
&mut self.targets
}
pub fn version(&self) -> &Version {
self.package_id().version()
}
Expand Down