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

Bump quote to 0.5 #1303

Merged
merged 3 commits into from
Apr 7, 2018
Merged

Bump quote to 0.5 #1303

merged 3 commits into from
Apr 7, 2018

Conversation

Eijebong
Copy link
Contributor

@Eijebong Eijebong commented Apr 3, 2018

No description provided.

#![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]


pub const g_107: ::std::os::raw::c_ulonglong = 18446744073709551615;
pub const g_107: ::std::os::raw::c_ulonglong = -1;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is because proc-macro2 casts ints as i64 if they aren't suffixed

Copy link
Member

Choose a reason for hiding this comment

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

This will be fixed after rust-lang/rust#49597 has landed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does that mean another proc-macro2 breaking change ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also this doesn't work for u32 soooo....

@Eijebong
Copy link
Contributor Author

Eijebong commented Apr 4, 2018

Ok this is ready now I think :)

/// I'm in an inline namespace, and as such I shouldn't get generated inside
/// a rust module, except when the relevant option is specified. Also, this
/// comment shouldn't be misaligned.
#[doc = " I\'m in an inline namespace, and as such I shouldn\'t get generated inside\n a rust module, except when the relevant option is specified. Also, this\n comment shouldn\'t be misaligned."]
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not great :(

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I know :(

@@ -111,7 +96,7 @@ pub mod root {
concat!("Alignment of ", stringify!(InInlineNS))
);
}

#[doc = ""]
Copy link
Contributor

Choose a reason for hiding this comment

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

This should check whether the comment is empty.

@@ -54,7 +54,7 @@ fn preprocess_single_lines(comment: &str, indent: usize) -> String {
let indent = if is_first { "" } else { &*indent };
is_first = false;
let maybe_space = if l.is_empty() { "" } else { " " };
format!("{}///{}{}", indent, maybe_space, l)
format!("{}{}{}", indent, maybe_space, l)
Copy link
Contributor

Choose a reason for hiding this comment

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

If we end up going for #[doc] stuff, all the maybe_space stuff can go away, but I don't see how multiline stuff works now, it seems to mangle the documentation, which I think it's not acceptable.

@emilio
Copy link
Contributor

emilio commented Apr 7, 2018

@bors-servo r+

@bors-servo
Copy link

📌 Commit 3258c5a has been approved by emilio

@bors-servo
Copy link

⌛ Testing commit 3258c5a with merge 8fe4d63...

bors-servo pushed a commit that referenced this pull request Apr 7, 2018
@bors-servo
Copy link

☀️ Test successful - status-travis
Approved by: emilio
Pushing 8fe4d63 to master...

@bors-servo bors-servo merged commit 3258c5a into rust-lang:master Apr 7, 2018
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.

5 participants