Skip to content

Update slug style to use _ instead of - - #1426

Merged
davidtwco merged 1 commit into
rust-lang:masterfrom
est31:fluent_underscore
Aug 17, 2022
Merged

Update slug style to use _ instead of -#1426
davidtwco merged 1 commit into
rust-lang:masterfrom
est31:fluent_underscore

Conversation

@est31

@est31 est31 commented Aug 12, 2022

Copy link
Copy Markdown
Member

Due to changes by rust-lang/rust#100377

@est31

est31 commented Aug 12, 2022

Copy link
Copy Markdown
Member Author

cc @davidtwco

@davidtwco davidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, a couple of fixes, almost all correcting my previous mistakes.

Comment thread src/diagnostics/diagnostic-structs.md Outdated
Comment thread src/diagnostics/diagnostic-structs.md Outdated
Comment thread src/diagnostics/translation.md
@est31
est31 force-pushed the fluent_underscore branch 2 times, most recently from e6ed8a9 to 4165dfb Compare August 12, 2022 10:27
@JohnTitor JohnTitor added the S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content label Aug 13, 2022
Comment thread src/diagnostics/diagnostic-structs.md Outdated
@est31
est31 force-pushed the fluent_underscore branch from 4165dfb to 6e0663e Compare August 16, 2022 06:04
@davidtwco

Copy link
Copy Markdown
Member

rust-lang/rust#100377 has landed now

@tshepang

Copy link
Copy Markdown
Member

@davidtwco you should be able to merge this if you are happy

@davidtwco

Copy link
Copy Markdown
Member

@davidtwco you should be able to merge this if you are happy

I'm still waiting on a comment to be resolved.

@est31
est31 force-pushed the fluent_underscore branch from 6e0663e to cc5bac8 Compare August 16, 2022 18:35

@davidtwco davidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for sticking with this, there's a few more pre-existing out-of-date parts that I'd appreciate if you updated, then we can merge this :)

Comment thread src/diagnostics/diagnostic-structs.md Outdated
diag.span_label(
self.span,
rustc_errors::DiagnosticMessage::fluent_attr("typeck-field-already-declared", "label")
rustc_errors::DiagnosticMessage::FluentAttr(

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We use the typed identifiers here too...

Comment thread src/diagnostics/diagnostic-structs.md Outdated
diag.span_label(
self.prev_span,
rustc_errors::DiagnosticMessage::fluent_attr("typeck-field-already-declared", "previous-decl-label")
rustc_errors::DiagnosticMessage::FluentAttr(

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

..and here..

Comment thread src/diagnostics/diagnostic-structs.md Outdated
match self {
ExpectedReturnTypeLabel::Unit { span } => {
diag.span_label(span, DiagnosticMessage::fluent("typeck-expected-default-return-type"))
diag.span_label(span, DiagnosticMessage::fluent("typeck_expected_default_return_type"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

..and here..

Comment thread src/diagnostics/diagnostic-structs.md Outdated
ExpectedReturnTypeLabel::Other { span, expected } => {
diag.set_arg("expected", expected);
diag.span_label(span, DiagnosticMessage::fluent("typeck-expected-return-type"))
diag.span_label(span, DiagnosticMessage::fluent("typeck_expected_return_type"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

..and here..

@JohnTitor JohnTitor added S-waiting-on-author Status: this PR is waiting for additional action by the OP and removed S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content labels Aug 17, 2022
@est31
est31 force-pushed the fluent_underscore branch from cc5bac8 to f6c3767 Compare August 17, 2022 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-author Status: this PR is waiting for additional action by the OP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants