Skip to content

Commit aae84a1

Browse files
committed
revert: broken rebase
1 parent 8a177a3 commit aae84a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1
-636
lines changed

compiler-core/src/warning.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ only lowercase alphanumeric characters or underscores."
255255
"Rename `{path}` to be valid, or remove this file from the project source."
256256
)),
257257
},
258-
259258
Warning::DeprecatedSyntax {
260259
path,
261260
src,
@@ -280,7 +279,6 @@ like this: `[item, ..list]`.",
280279
extra_labels: vec![],
281280
}),
282281
},
283-
284282
Warning::DeprecatedSyntax {
285283
path,
286284
src,
@@ -304,7 +302,6 @@ like this: `[item, ..list]`.",
304302
extra_labels: vec![],
305303
}),
306304
},
307-
308305
Warning::DeprecatedSyntax {
309306
path,
310307
src,
@@ -324,7 +321,6 @@ like this: `[item, ..list]`.",
324321
extra_labels: vec![],
325322
}),
326323
},
327-
328324
Warning::DeprecatedSyntax {
329325
path,
330326
src,
@@ -347,7 +343,6 @@ To match on all possible lists, use the `_` catch-all pattern instead.",
347343
extra_labels: vec![],
348344
}),
349345
},
350-
351346
Warning::DeprecatedSyntax {
352347
path,
353348
src,
@@ -376,7 +371,6 @@ To match on all possible lists, use the `_` catch-all pattern instead.",
376371
}),
377372
}
378373
}
379-
380374
Self::Type { path, warning, src } => match warning {
381375
type_::Warning::Todo {
382376
kind,
@@ -1032,16 +1026,11 @@ See: https://tour.gleam.run/advanced-features/{name}/"
10321026
Your code will crash before reaching this point.",
10331027
PanicPosition::LastFunctionArgument =>
10341028
"This function call is unreachable because its last argument always panics. \
1035-
<<<<<<< HEAD
1036-
Your code will crash before reaching this point."
1037-
}
1029+
Your code will crash before reaching this point.",
10381030
PanicPosition::EchoExpression => {
10391031
"This `echo` won't print anything because the expression it \
10401032
should be printing always panics."
10411033
}
1042-
=======
1043-
Your code will crash before reaching this point.",
1044-
>>>>>>> 8fbfe3026 (refactor: remove unnecessary changes)
10451034
};
10461035

10471036
Diagnostic {

test-output/Cargo.toml

Lines changed: 0 additions & 15 deletions
This file was deleted.

test-output/cases/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

test-output/cases/echo_bitarray/gleam.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

test-output/cases/echo_bitarray/src/main.gleam

Lines changed: 0 additions & 5 deletions
This file was deleted.

test-output/cases/echo_bool/gleam.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

test-output/cases/echo_bool/src/main.gleam

Lines changed: 0 additions & 4 deletions
This file was deleted.

test-output/cases/echo_custom_type/gleam.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

test-output/cases/echo_custom_type/src/main.gleam

Lines changed: 0 additions & 11 deletions
This file was deleted.

test-output/cases/echo_dict/gleam.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)