Skip to content

Conversation

sfackler
Copy link
Member

This restores module names to the logging output

@rust-highfive
Copy link
Contributor

r? @estebank

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

@sfackler
Copy link
Member Author

cc @nikomatsakis

r? @alexcrichton

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2018
@alexcrichton
Copy link
Member

@KodrAus mentioned that env_logger is close to an 0.5 release (like in the next day or two), so r=me if we hold out for that and then update here.

@kennytm kennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jan 17, 2018
@kennytm
Copy link
Member

kennytm commented Jan 17, 2018

env_logger 0.5.0 has been released. https://crates.io/crates/env_logger

@nikomatsakis
Copy link
Contributor

my hero

@sfackler
Copy link
Member Author

Updated!

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 17, 2018
@alexcrichton
Copy link
Member

Urgh. By pulling in winapi 0.3 this'll be blocked on #47280. I wonder though if that could be avoided for now?

@kennytm
Copy link
Member

kennytm commented Jan 17, 2018

I think the winapi 0.3 problem won't affect this PR since cargo is not updated.

The winapi dependency chain is:

  • env_logger 0.5.0 ← chrono 0.4.0 ← time 0.1.39 ← winapi 0.3.3

If we downgrade time to 0.1.38 it will depend on winapi 0.2 instead.

@alexcrichton
Copy link
Member

@kennytm unfortunately it was a problem if winapi is anywhere in the crate dependency graph, not just as a direct dependency :(

@sfackler
Copy link
Member Author

We could manually downgrade time to a version that pulled in winapi 0.2. It might be a bit fragile to maintain though.

@kennytm
Copy link
Member

kennytm commented Jan 17, 2018

@alexcrichton Oh that's bad :(

So we need to stick a time = "=0.1.38" constraint somewhere, or is there any command to force the generated Cargo.lock to choose time = "=0.1.38"?

@kennytm
Copy link
Member

kennytm commented Jan 17, 2018

@sfackler It is just a temporary measure, after #47280 there should be no problem using winapi 0.3

@alexcrichton
Copy link
Member

@sfackler yeah that's fine for now, this is just a temporary problem until #47280 lands which is for sure to happen, I'd just want to uncouple these two changes for now.

@alexcrichton
Copy link
Member

@kennytm we could have a constraint or just use cargo update -p time --precise 0.1.38

@sfackler
Copy link
Member Author

Updated.

(If you find yourself needing to do this again for whatever reason, the magic phrase is cargo update -p time --precise 0.1.38)

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 17, 2018

📌 Commit da00ea3 has been approved by alexcrichton

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 17, 2018
@kennytm kennytm removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 18, 2018
@frewsxcv
Copy link
Member

@bors rollup

@kennytm
Copy link
Member

kennytm commented Jan 21, 2018

@bors r-

This PR brings in chrono 0.4.0 as a dependency. When documenting this package (the strftime module) as part of the compiler, it was found to contain rendering difference between pulldown and hoedown.

I believe this is because hoedown/pulldown doesn't format to the same HTML.

[01:43:21] WARNING: documentation for this crate may be rendered differently using the new Pulldown renderer.
[01:43:21]     See https://github.com/rust-lang/rust/issues/44229 for details.
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[0]/td[1] One element is missing: expected: `strong`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[0] Unexpected element `td`: found: `<td><strong>DATE SPECIFIERS:</strong></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[4] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[4] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[9] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[9] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[12] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[12] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[17] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[17] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[20] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[20] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[24] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[24] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[26] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[26] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[31] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[31] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[32]/td[1] One element is missing: expected: `strong`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[32] Unexpected element `td`: found: `<td><strong>TIME SPECIFIERS:</strong></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[37] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[37] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[40] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[40] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[48] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[48] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[53] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[53] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[54]/td[1] One element is missing: expected: `strong`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[54] Unexpected element `td`: found: `<td><strong>TIME ZONE SPECIFIERS:</strong></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[58] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[58] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[59]/td[1] One element is missing: expected: `strong`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[59] Unexpected element `td`: found: `<td><strong>DATE &amp; TIME SPECIFIERS:</strong></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[62] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[62] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[64] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[64] Unexpected element `td`: found: `<td></td>`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[65]/td[1] One element is missing: expected: `strong`
[01:43:21] WARNING: rendering difference in ``strftime`/`strptime`-inspired date and time formatting syntax.`
[01:43:21]    --> /cargo/registry/src/github.com-1ecc6299db9ec823/chrono-0.4.0/src/format/strftime.rs:4:0
[01:43:21]     /html[0]/body[0]/table[0]/tbody[0]/tr[65] Unexpected element `td`: found: `<td><strong>SPECIAL SPECIFIERS:</strong></td>`
[01:43:21] Aborting with 1 rendering differences
[01:43:21] �[m�[m�[31m�[1merror:�[m Could not document `chrono`.

cc @GuillaumeGomez. I think we should fix pulldown or hoedown, instead of requiring chrono to update the docs. Never mind, the rendering difference is legit. chrono should switch to that table syntax with a leading |.

@kennytm kennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 21, 2018
@kennytm
Copy link
Member

kennytm commented Jan 21, 2018

Now blocked by either:

@kennytm kennytm mentioned this pull request Jan 23, 2018
@bors
Copy link
Collaborator

bors commented Jan 23, 2018

☔ The latest upstream changes (presumably #47678) made this pull request unmergeable. Please resolve the merge conflicts.

@kennytm
Copy link
Member

kennytm commented Jan 25, 2018

env_logger has been updated to 0.5.3 in #47729, so this PR should not be needed anymore. Closing.

@kennytm kennytm closed this Jan 25, 2018
@alexcrichton
Copy link
Member

@kennytm oh note that the update there was just for Cargo not for rustc, so we may still need this for rustc itself?

@kennytm
Copy link
Member

kennytm commented Jan 25, 2018

Err sorry @alexcrichton you're right, missed the rest of the changes.

Still this needs a rebase, and #47501 (comment).

@kennytm kennytm reopened this Jan 25, 2018
@shepmaster shepmaster added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 3, 2018
@pietroalbini pietroalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 12, 2018
@pietroalbini pietroalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 19, 2018
@pietroalbini pietroalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 26, 2018
@pietroalbini pietroalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 5, 2018
@alexcrichton
Copy link
Member

I'm gonna close this in favor of #48642 in the hopes that it gets through

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked Status: Blocked on something else such as an RFC or other implementation work.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants