Border crossing concerns

So we all know about the issues with Americans coming across the border and being treated horribly/detained. My specific inquiry, I guess, is what's the situation like on amtrak? I'm visiting my long distance partner in Montrèal in June, im taking the train, I am bringing my student ID, State ID, passport etc, im bringing bare minimum when it comes to clothing, accessories etc. But both my partner and i are having anxiety about my crossing back over the border from Canada Have there been any issues on the train? Should i expect anything different from the last time I went up in january?

Any answers, advice etc is extremely helpful, im doubtful anything will happen but i just want to have some peace of mind, you know?