-
Notifications
You must be signed in to change notification settings - Fork 409
fix path issue #994
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
fix path issue #994
Conversation
28b118a
to
fb18ea7
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
0b89079
to
e225eae
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
c593fa3
to
caab4d4
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
6879657
to
a57ec6d
Compare
This comment was marked as outdated.
This comment was marked as outdated.
06e8f2c
to
4dc5b55
Compare
should fail, no fix applied bors try --target cross |
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
f109eba
to
1301d36
Compare
bors try --target cross |
This comment was marked as outdated.
This comment was marked as outdated.
1301d36
to
37c27b4
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as off-topic.
This comment was marked as off-topic.
bors try- bors try --target cross |
tryBuild failed: |
it failed for the correct reason now! bors try --target cross |
tryBuild succeeded: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be good to go
src/docker/shared.rs
Outdated
@@ -261,7 +261,7 @@ pub struct Directories { | |||
impl Directories { | |||
pub fn create( | |||
mount_finder: &MountFinder, | |||
metadata: &CargoMetadata, | |||
metadata: &mut CargoMetadata, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to ensure that further path references are correct, we specify this as &mut
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure I like this design: we should probably either:
- Factor this out into 2 functions (one to find the mount path of the target directory and one for
Directories::create
) - Rename the function so it's clear it modifies
CargoMetadata
.
src/docker/shared.rs
Outdated
@@ -335,7 +335,7 @@ impl Directories { | |||
Ok(Directories { | |||
cargo, | |||
xargo, | |||
target, | |||
target: metadata.target_directory.clone(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ideally, we'd not have this here, but sometimes we use Directories
, sometimes we use CargoMetadata
, ideally we'd only use one CargoMetadata
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Directories::create
with the mount finder changes needs to be refactored into 2 functions, or the function needs to be renamed. Something that is supposed to create a new struct shouldn't modify one of its arguments.
src/docker/shared.rs
Outdated
@@ -261,7 +261,7 @@ pub struct Directories { | |||
impl Directories { | |||
pub fn create( | |||
mount_finder: &MountFinder, | |||
metadata: &CargoMetadata, | |||
metadata: &mut CargoMetadata, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure I like this design: we should probably either:
- Factor this out into 2 functions (one to find the mount path of the target directory and one for
Directories::create
) - Rename the function so it's clear it modifies
CargoMetadata
.
33d16d9
to
b1f8b5c
Compare
b1f8b5c
to
143e366
Compare
Nice change with bors r+ |
👎 Rejected by code reviews |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bors r+
Build succeeded: |
fixes #993
this issue presents because the
--file
arg is wrong