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

Fix for #3722 #3767

Merged
merged 3 commits into from
Mar 1, 2017
Merged

Fix for #3722 #3767

merged 3 commits into from
Mar 1, 2017

Conversation

ehiggs
Copy link
Contributor

@ehiggs ehiggs commented Feb 27, 2017

When using init, add [[bin]] and [lib] section where appropriate.

When using init, add [[bin]] and [lib] section where appropriate.
@rust-highfive
Copy link

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

tests/init.rs Outdated
@@ -94,36 +94,48 @@ fn bin_already_exists(explicit: bool, rellocation: &str) {
let mut new_content = Vec::new();
File::open(&sourcefile_path).unwrap().read_to_end(&mut new_content).unwrap();
assert_eq!(Vec::from(content as &[u8]), new_content);

let mut cargo_content = String::new();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation here looks like it may be a bit off?

@alexcrichton
Copy link
Member

Looks great to me, thanks!

🙇‍♂️
@matklad
Copy link
Member

matklad commented Mar 1, 2017

@alexcrichton looks like you've forgotten to r+? Or is there anything else here to do?

@ehiggs
Copy link
Contributor Author

ehiggs commented Mar 1, 2017

Further issues #3722: if cargo init detects a main function, but wasn't given --bin then it still prints Created library project. But that can be done in a separate PR imho.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 1, 2017

📌 Commit 8e4b8b2 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 1, 2017

⌛ Testing commit 8e4b8b2 with merge bdce1f5...

bors added a commit that referenced this pull request Mar 1, 2017
Fix for #3722

When using init, add [[bin]] and [lib] section where appropriate.
@bors
Copy link
Contributor

bors commented Mar 1, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing bdce1f5 to master...

@bors bors merged commit 8e4b8b2 into rust-lang:master Mar 1, 2017
@ehuss ehuss added this to the 1.17.0 milestone Feb 6, 2022
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.

6 participants