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.

Sign up for GitHub

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

Jump to bottom

Rollup of 7 pull requests #113865

Merged
merged 20 commits into from
Jul 19, 2023
Merged

Rollup of 7 pull requests #113865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift click to select a range
662e9d0
add test for incomplete alias bound preference
lcnr Jul 13, 2023
51e1f7a
Simplify foreign_modules.
cjgillot Jul 15, 2023
fdc93f3
Do not fetch HIR in native_libs.
cjgillot Jul 15, 2023
6fb4ce9
Fix invalid display of inlined re-export
GuillaumeGomez Jul 16, 2023
c845a53
Add regression test for #105735
GuillaumeGomez Jul 16, 2023
afec6d2
Remove unneeded `Option<Symbol>` in `foreign_items`
GuillaumeGomez Jul 17, 2023
cc08749
Add the `no-builtins` attribute to functions when `no_builtins` is ap…
DianQK Jul 18, 2023
09743b9
Bless ui tests.
cjgillot Jul 17, 2023
7197979
Fix inline_const with interpolated block
compiler-errors Jul 17, 2023
fe4d1f9
Fix quotes in output
compiler-errors Jul 17, 2023
a872762
Improve error message when closing bracket interpreted as formatting …
compiler-errors Jul 17, 2023
e021191
Fix unit tests
compiler-errors Jul 17, 2023
846cc63
Make it clearer that edition functions are >=, not ==
compiler-errors Jul 16, 2023
c2257b9
Rollup merge of #113444 - lcnr:alias-bound-test, r=compiler-errors
Dylan-DPC Jul 19, 2023
c1d6d32
Rollup merge of #113716 - DianQK:add-no_builtins-to-function, r=pnkfelix
Dylan-DPC Jul 19, 2023
dbb6b1a
Rollup merge of #113754 - cjgillot:simplify-foreign, r=petrochenkov
Dylan-DPC Jul 19, 2023
a47b7b0
Rollup merge of #113765 - compiler-errors:at-least, r=oli-obk
Dylan-DPC Jul 19, 2023
444ac1a
Rollup merge of #113774 - compiler-errors:fill-expr-bracket, r=eholk
Dylan-DPC Jul 19, 2023
c7c8914
Rollup merge of #113785 - GuillaumeGomez:tests/rustdoc/issue-105735-f…
Dylan-DPC Jul 19, 2023
6c3cbcd
Rollup merge of #113803 - compiler-errors:const-interp-block, r=fee1-…
Dylan-DPC Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix quotes in output
  • Loading branch information
@compiler-errors
compiler-errors committed Jul 19, 2023
commit fe4d1f9fe979bab54aba6316a5207f7793d751b1
2 changes: 1 addition & 1 deletion compiler/rustc_parse_format/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 460,7 @@ impl<'a> Parser<'a> {
} else {
let pos = self.to_span_index(pos);
let description = format!("expected `'}}'`, found `{maybe:?}`");
let label = "expected `}`".to_owned();
let label = "expected `'}'`".to_owned();
let (note, secondary_label) = if c == '}' {
(
Some(
Expand Down
26 changes: 13 additions & 13 deletions tests/ui/fmt/format-string-error-2.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 10,7 @@ error: invalid format string: expected `'}'`, found `'a'`
LL | format!("{
| - because of this opening brace
LL | a");
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand All @@ -21,15 21,15 @@ LL | format!("{ \
| - because of this opening brace
LL | \
LL | b");
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:11:18
|
LL | format!(r#"{ \
| - ^ expected `}` in format string
| - ^ expected `'}'` in format string
| |
| because of this opening brace
|
Expand All @@ -39,7 39,7 @@ error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:15:18
|
LL | format!(r#"{ \n
| - ^ expected `}` in format string
| - ^ expected `'}'` in format string
| |
| because of this opening brace
|
Expand All @@ -52,7 52,7 @@ LL | format!("{ \n
| - because of this opening brace
LL | \n
LL | e");
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand All @@ -62,7 62,7 @@ error: invalid format string: expected `'}'`, found `'a'`
LL | {
| - because of this opening brace
LL | a");
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand All @@ -72,7 72,7 @@ error: invalid format string: expected `'}'`, found `'a'`
LL | {
| - because of this opening brace
LL | a
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand All @@ -83,7 83,7 @@ LL | { \
| - because of this opening brace
LL | \
LL | b");
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand All @@ -94,15 94,15 @@ LL | { \
| - because of this opening brace
LL | \
LL | b \
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:45:8
|
LL | raw { \
| - ^ expected `}` in format string
| - ^ expected `'}'` in format string
| |
| because of this opening brace
|
Expand All @@ -112,7 112,7 @@ error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error-2.rs:50:8
|
LL | raw { \n
| - ^ expected `}` in format string
| - ^ expected `'}'` in format string
| |
| because of this opening brace
|
Expand All @@ -125,7 125,7 @@ LL | { \n
| - because of this opening brace
LL | \n
LL | e");
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand All @@ -135,7 135,7 @@ error: invalid format string: expected `'}'`, found `'a'`
LL | {
| - because of this opening brace
LL | asdf}
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/fmt/format-string-error.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 62,7 @@ error: invalid format string: expected `'}'`, found `'\'`
--> $DIR/format-string-error.rs:19:23
|
LL | let _ = format!("{\}");
| -^ expected `}` in format string
| -^ expected `'}'` in format string
| |
| because of this opening brace
|
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/fmt/format-string-wrong-order.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 26,7 @@ error: invalid format string: expected `'}'`, found `'?'`
--> $DIR/format-string-wrong-order.rs:9:15
|
LL | format!("{??}", bar);
| -^ expected `}` in format string
| -^ expected `'}'` in format string
| |
| because of this opening brace
|
Expand All @@ -36,7 36,7 @@ error: invalid format string: expected `'}'`, found `'?'`
--> $DIR/format-string-wrong-order.rs:11:15
|
LL | format!("{?;bar}");
| -^ expected `}` in format string
| -^ expected `'}'` in format string
| |
| because of this opening brace
|
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/fmt/ifmt-bad-arg.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 178,7 @@ error: invalid format string: expected `'}'`, found `'t'`
LL | ninth number: {
| - because of this opening brace
LL | tenth number: {}",
| ^ expected `}` in format string
| ^ expected `'}'` in format string
|
= note: if you intended to print `{`, you can escape it using `{{`

Expand Down